Allow throw in SYSCALLs (#339)

neo-project · Jun 23, 2020 · baf4989 · baf4989
1 parent 446fd24
commit baf4989
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 2 deletions.
diff --git a/src/neo-vm/ExecutionEngine.cs b/src/neo-vm/ExecutionEngine.cs
@@ -340,8 +340,7 @@ private void ExecuteInstruction(Instruction instruction)
                     }
                 case OpCode.THROW:
                     {
-                        UncaughtException = Pop();
-                        HandleException();
+                        Throw(Pop());
                         return;
                     }
                 case OpCode.TRY:
@@ -1448,5 +1447,11 @@ public void Push(StackItem item)
         {
             CurrentContext.EvaluationStack.Push(item);
         }
+
+        public void Throw(StackItem ex)
+        {
+            UncaughtException = ex;
+            HandleException();
+        }
     }
 }
diff --git a/tests/neo-vm.Tests/Tests/OpCodes/Control/TRY_CATCH.json b/tests/neo-vm.Tests/Tests/OpCodes/Control/TRY_CATCH.json
@@ -2,6 +2,64 @@
   "category": "Control",
   "name": "TRY_CATCH",
   "tests": [
+    {
+      "name": "try catch with syscall exception",
+      "script": [
+        "TRY",
+        "0x0a00",
+        "SYSCALL",
+        "0xdeaddead",
+        "ENDTRY",
+        "0x05",
+        "PUSH1",
+        "ENDTRY",
+        "0x02",
+        "PUSH2"
+      ],
+      "steps": [
+        {
+          "actions": [
+            "stepInto",
+            "stepInto",
+            "stepInto"
+          ],
+          "result": {
+            "state": "BREAK",
+            "invocationStack": [
+              {
+                "instructionPointer": 13,
+                "nextInstruction": "PUSH2",
+                "evaluationStack": [
+                  {
+                    "type": "ByteString",
+                    "value": "0x6572726f72"
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "actions": [
+            "stepInto",
+            "stepInto"
+          ],
+          "result": {
+            "state": "HALT",
+            "resultStack": [
+              {
+                "type": "integer",
+                "value": 2
+              },
+              {
+                "type": "ByteString",
+                "value": "0x6572726f72"
+              }
+            ]
+          }
+        }
+      ]
+    },
     {
       "name": "try catch without exception",
       "script": [

diff --git a/tests/neo-vm.Tests/Types/TestEngine.cs b/tests/neo-vm.Tests/Types/TestEngine.cs
@@ -13,6 +13,12 @@ protected override void OnSysCall(uint method)
                 return;
             }
 
+            if (method == 0xaddeadde)
+            {
+                Throw("error");
+                return;
+            }
+
             throw new System.Exception();
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,12 @@ protected override void OnSysCall(uint method) @@
                     return;
                 }
+                if (method == 0xaddeadde)
+                {
+                    Throw("error");
+                    return;
+                }
                 throw new System.Exception();
             }
         }
@@ Expand Down @@