added run config

riscemu/CPU.py

@@ -4,25 +4,20 @@ from collections import defaultdict
 
 from .Exceptions import *
 from .helpers import *
+from .Config import RunConfig
 
 import typing
+
 if typing.TYPE_CHECKING:
     from . import MMU, Executable, LoadedExecutable, LoadedInstruction
 
-COLOR = True
-
-FMT_ORANGE = '\033[33m'
-FMT_GRAY = '\033[37m'
-FMT_BOLD = '\033[1m'
-FMT_NONE = '\033[0m'
-FMT_UNDERLINE = '\033[4m'
-
 
 class Registers:
-    def __init__(self):
+    def __init__(self, conf: RunConfig):
         self.vals = defaultdict(lambda: 0)
         self.last_mod = None
         self.last_access = None
+        self.conf = conf
 
     def dump(self, small=False):
         named_regs = [self.reg_repr(reg) for reg in Registers.named_registers()]
@@ -67,6 +62,8 @@ class Registers:
 
     def reg_repr(self, reg):
         txt = '{:4}=0x{:08X}'.format(reg, self.get(reg))
+        if not self.conf.color:
+            return txt
         if reg == 'fp':
             reg = 's0'
         if reg == self.last_mod:
@@ -112,14 +109,16 @@ class Registers:
     def named_registers():
         return ['zero', 'ra', 'sp', 'gp', 'tp', 'fp']
 
+
 class CPU:
-    def __init__(self):
+    def __init__(self, conf: RunConfig):
         from . import MMU, Executable, LoadedExecutable, LoadedInstruction
 
-        self.mmu = MMU()
+        self.mmu = MMU(conf)
         self.regs = Registers()
         self.pc = 0
         self.exit = False
+        self.conf = conf
 
         self.syscall_int = SyscallInterface()
 
@@ -289,7 +288,6 @@ class CPU:
         if self.regs.get(reg1) < self.regs.get(reg2):
             self.pc = dest
 
-
     def instruction_bge(self, ins: 'LoadedInstruction'):
         INS_NOT_IMPLEMENTED(ins)
 
@@ -325,6 +323,7 @@ class CPU:
         INS_NOT_IMPLEMENTED(ins)
 
     def instruction_dbg(self, ins: 'LoadedInstruction'):
+        if self.conf.debug_instruction:
             import code
             code.interact(local=dict(globals(), **locals()))
 
@@ -345,5 +344,3 @@ class SyscallInterface:
     def handle_syscall(self, scall: Syscall):
         print("syscall {} received!".format(scall.id))
         scall.registers.dump_reg_a()
-
-

riscemu/Config.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+@dataclass()
+class RunConfig:
+    color = True
+    preffered_stack_size = None
+    debug_instruction = True
+

riscemu/Executable.py

@@ -53,7 +53,7 @@ class InstructionMemorySection(MemorySection):
         ]
 
 
-@dataclass(frozen=True)
+@dataclass()
 class Executable:
     run_ptr: Tuple[str, int]
     sections: Dict[str, MemorySection]

riscemu/MMU.py

@@ -1,5 +1,4 @@
-from dataclasses import dataclass
+from .Config import RunConfig
-
 from .Executable import Executable, LoadedExecutable, LoadedMemorySection
 from .helpers import align_addr
 from .Exceptions import OutOfMemoryEsception
@@ -14,10 +13,11 @@ class MMU:
     binaries: List[LoadedExecutable]
     last_bin: Optional[LoadedExecutable] = None
 
-    def __init__(self):
+    def __init__(self, conf: RunConfig):
         self.sections = list()
         self.binaries = list()
         self.last_bin = None
+        self.conf = conf
 
     def load_bin(self, bin: Executable):
         if self.last_bin is None:
@@ -27,6 +27,10 @@ class MMU:
         # align to 8 byte word
         addr = align_addr(addr)
 
+        # apply preferred stack size from config
+        if bin.stack_pref is None:
+            bin.stack_pref = self.conf.preffered_stack_size
+
         loaded_bin = LoadedExecutable(bin, addr)
 
         if loaded_bin.size + addr > self.max_size:

riscemu/__init__.py

@@ -11,3 +11,5 @@ from .ExecutableParser import ExecutableParser
 from .MMU import MMU
 
 from .CPU import CPU, Registers, Syscall, SyscallInterface
+
+from .Config import RunConfig

riscemu/helpers.py

@@ -36,3 +36,8 @@ def int_from_bytes(bytes):
         return num - 2 ** (8 * len(bytes))
     return num
 
+FMT_ORANGE = '\033[33m'
+FMT_GRAY = '\033[37m'
+FMT_BOLD = '\033[1m'
+FMT_NONE = '\033[0m'
+FMT_UNDERLINE = '\033[4m'