get fu compunit test to use ISACaller instruction-memory

[soc.git] / src / soc / decoder / isa / caller.py

diff --git a/src/soc/decoder/isa/caller.py b/src/soc/decoder/isa/caller.py
index 51ae83c1fb11579ebcebbd40e0a043fdbbb68197..c62a32c3416e0522615387ea481ebb11de8e4efe 100644 (file)
--- a/src/soc/decoder/isa/caller.py
+++ b/src/soc/decoder/isa/caller.py
@@ -226,6 +226,8 @@ class ISACaller:
             initial_insns = {}
             assert self.respect_pc == False, "instructions required to honor pc"
 
             initial_insns = {}
             assert self.respect_pc == False, "instructions required to honor pc"
 

+        print ("ISACaller insns", respect_pc, initial_insns, disassembly)
+

         # "fake program counter" mode (for unit testing)
         if not respect_pc:
             if isinstance(initial_mem, tuple):
         # "fake program counter" mode (for unit testing)
         if not respect_pc:
             if isinstance(initial_mem, tuple):


@@ -399,23 +401,24 @@ class ISACaller:
             pc = self.pc.CIA.value
         else:
             pc = self.fake_pc
             pc = self.pc.CIA.value
         else:
             pc = self.fake_pc

-        ins = yield self.imem.ld(pc, 4, False)
-        yield self.pdecode2.dec.raw_opcode_in.eq(ins)
-        yield self.pdecode2.dec.bigendian.eq(0)  # little / big?
-        self._pc
+        self._pc = pc
+        ins = self.imem.ld(pc, 4, False)
+        print("setup: 0x{:X} 0x{:X}".format(pc, ins & 0xffffffff))
+
+        yield self.dec2.dec.raw_opcode_in.eq(ins)
+        yield self.dec2.dec.bigendian.eq(0)  # little / big?

 
     def execute_one(self):
         """execute one instruction
         """
         # get the disassembly code for this instruction
         code = self.disassembly[self._pc]
 
     def execute_one(self):
         """execute one instruction
         """
         # get the disassembly code for this instruction
         code = self.disassembly[self._pc]

+        print("sim-execute", hex(self._pc), code)

         opname = code.split(' ')[0]
         opname = code.split(' ')[0]

-        yield from call(opname)
+        yield from self.call(opname)

 
         if not self.respect_pc:
             self.fake_pc += 4
 
         if not self.respect_pc:
             self.fake_pc += 4

-        #else:
-            #self.pc.CIA.value = self.pc.NIA.value

 
     def call(self, name):
         # TODO, asmregs is from the spec, e.g. add RT,RA,RB
 
     def call(self, name):
         # TODO, asmregs is from the spec, e.g. add RT,RA,RB