const-reset hell

bieganski · Sep 16, 2023 · 6d53184 · 6d53184
1 parent 493c702
commit 6d53184
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mtkcpu/units/csr/csr.py b/mtkcpu/units/csr/csr.py
@@ -74,8 +74,8 @@ def __init__(self,
         self.rd_val = Signal(32)
         self.vld = Signal()
         self.illegal_insn = Signal()
-
-        self.csr_regs = [x(my_reg_latch=Signal(32)) for x in __class__.enabled_csr_regs(with_virtual_memory=with_virtual_memory)]
+        # raise ValueError((hex(MISA.const().value)))
+        self.csr_regs = [x(my_reg_latch=Signal(32, reset=x.const().value)) for x in __class__.enabled_csr_regs(with_virtual_memory=with_virtual_memory)]
 
     def elaborate(self, platform):
         m = self.m = Module()

diff --git a/mtkcpu/units/csr/csr_handlers.py b/mtkcpu/units/csr/csr_handlers.py
@@ -42,7 +42,7 @@ def latch_whole_value_with_no_side_effect(self):
 
     @classmethod
     def const(cls) -> int:
-        return cls.layout.const(init=None)
+        return cls.layout.const(cls.reset())
 
     @staticmethod
     def reset() -> dict[str, int]: