Merge pull request #86 from CommitteeOfZero/common/implement-flagoffr…

…eturn common/implement-flagoffreturn: properly implement 00 5C
CommitteeOfZero · Nov 1, 2024 · 5716437 · 5716437
2 parents 1b896a5 + bf95ee6
commit 5716437
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/vm/inst_controlflow.cpp b/src/vm/inst_controlflow.cpp
@@ -288,12 +288,27 @@ VmInstruction(InstCase) {
   }
 }
 
-VmInstruction(InstFlagWait) {
+VmInstruction(InstFlagOffReturn) {
   StartInstruction;
-  PopUint8(type);
-  PopExpression(arg1);
-  ImpLogSlow(LL_Warning, LC_VMStub,
-             "STUB instruction SomethingOff(type: %i, arg1: %i)\n", type, arg1);
+  PopUint8(arg1);
+  PopExpression(arg2);
+  if (arg1 == GetFlag(arg2)) {
+    if (thread->CallStackDepth) {
+      thread->CallStackDepth--;
+      uint32_t retBufferId =
+          thread->ReturnScriptBufferIds[thread->CallStackDepth];
+      if (Profile::Vm::UseReturnIds) {
+        thread->Ip =
+            ScriptGetRetAddress(ScriptBuffers[retBufferId],
+                                thread->ReturnIds[thread->CallStackDepth]);
+      } else {
+        thread->Ip = thread->ReturnAddresses[thread->CallStackDepth];
+      }
+      thread->ScriptBufferId = retBufferId;
+    } else {
+      ImpLog(LL_Error, LC_VM, "Return error, call stack empty.\n");
+    }
+  }
 }
 
 }  // namespace Vm

diff --git a/src/vm/inst_controlflow.h b/src/vm/inst_controlflow.h
@@ -26,7 +26,7 @@ VmInstruction(InstPackFileAddBind);
 VmInstruction(InstLoadJump);
 VmInstruction(InstSwitch);
 VmInstruction(InstCase);
-VmInstruction(InstFlagWait);
+VmInstruction(InstFlagOffReturn);
 
 }  // namespace Vm
 

diff --git a/src/vm/opcodetables_cc.h b/src/vm/opcodetables_cc.h
@@ -107,7 +107,7 @@ InstructionProc static OpcodeTableSystem_CC[256] = {
     InstDummy,                // 00 59
     InstDummy,                // 00 5A
     InstDummy,                // 00 5B
-    InstFlagWait,             // 00 5C
+    InstFlagOffReturn,        // 00 5C
     InstDummy,                // 00 5D
     InstDummy,                // 00 5E
     InstPackFileAddBind,      // 00 5F