convert HDLState.get_mem() to a dictionary of memory state results

[soc.git] / src / soc / simple / test / teststate.py

diff --git a/src/soc/simple/test/teststate.py b/src/soc/simple/test/teststate.py
index 3b7eeb208351547eadf235eafee18ca10feeae33..3a65c9dc7628f27c72963392c72470e003411777 100644 (file)
--- a/src/soc/simple/test/teststate.py
+++ b/src/soc/simple/test/teststate.py
@@ -9,7 +9,7 @@ from openpower.decoder.power_enums import XER_bits
 from openpower.util import log
 from openpower.test.state import (State, state_add, state_factory,
                                   TestState,)
-
+from soc.fu.compunits.test.test_compunit import get_l0_mem
 
 class HDLState(State):
     def __init__(self, core):
@@ -50,17 +50,12 @@ class HDLState(State):
         log("class hdl pc", hex(self.pc))
 
     def get_mem(self):
-        if hasattr(self.core.l0.pimem, 'lsui'):
-            hdlmem = self.core.l0.pimem.lsui.mem
-        else:
-            hdlmem = self.core.l0.pimem.mem
-            if not isinstance(hdlmem, Memory):
-                hdlmem = hdlmem.mem
-        self.mem = []
+        # get the underlying HDL-simulated memory from the L0CacheBuffer
+        hdlmem = get_l0_mem(self.core.l0)
+        self.mem = {}
         for i in range(hdlmem.depth):
-            value = yield hdlmem._array[i]
-            if value != 0:  # for comparison purposes
-                self.mem.append(((i*8), value))
+            value = yield hdlmem._array[i] # should not really do this
+            self.mem[i*8] = value
 
 
 # add to State Factory