Add TerminateException, for example called from Environment

Author: wallento

riscvmodel/isa.py

@@ -762,3 +762,7 @@ def get_mnenomics():
     :rtype: List[str]
     """
     return [i._mnemonic for i in get_insns()]
+
+class TerminateException(Exception):
+    def __init__(self, returncode):
+        self.returncode = returncode

riscvmodel/model.py

@@ -123,8 +123,11 @@ def execute(self, insn):
         elif not isinstance(insn, list):
             insn = [insn]
 
-        for i in insn:
-            self.issue(i)
+        try:
+            for i in insn:
+                self.issue(i)
+        except TerminateException as ex:
+            assert ex.returncode == 0
 
     def randomize(self):
         self.state.randomize()

riscvmodel/sim.py

@@ -1,4 +1,5 @@
 from .model import Model, Memory
+from .isa import TerminateException
 
 import struct
 
@@ -22,7 +23,10 @@ def run(self, *, pc=0):
       try:
         self.model.issue(self.program[int(self.model.state.pc)>>2])
         cnt += 1
-      except IndexError as e:
+      except TerminateException as exc:
+        assert exc.returncode == 0
+        return cnt
+      except IndexError:
         return cnt
     return cnt