no python files to be committed in isafunctions

[openpower-isa.git] / src / openpower / decoder / isa / radixmmu.py

diff --git a/src/openpower/decoder/isa/radixmmu.py b/src/openpower/decoder/isa/radixmmu.py
index bd814457282247146cd313bac888009513ef3338..c647777f325c137e95ce534b331dff2262e22267 100644 (file)
--- a/src/openpower/decoder/isa/radixmmu.py
+++ b/src/openpower/decoder/isa/radixmmu.py
@@ -15,11 +15,11 @@ related bugs:
 
 #from nmigen.back.pysim import Settle
 from copy import copy
-from soc.decoder.selectable_int import (FieldSelectableInt, SelectableInt,
+from openpower.decoder.selectable_int import (FieldSelectableInt, SelectableInt,
                                         selectconcat)
-from soc.decoder.helpers import exts, gtu, ltu, undefined
-from soc.decoder.isa.mem import Mem
-from soc.consts import MSRb  # big-endian (PowerISA versions)
+from openpower.decoder.helpers import exts, gtu, ltu, undefined
+from openpower.decoder.isa.mem import Mem
+from openpower.consts import MSRb  # big-endian (PowerISA versions)
 
 import math
 import sys
@@ -308,9 +308,11 @@ class RADIX:
             return 0
 
         # use pte to load from phys address
-        return self.mem.ld(pte.value, width, swap, check_in_mem)
+        data = self.mem.ld(pte.value, width, swap, check_in_mem)
+        self.last_ld_addr = self.mem.last_ld_addr
 
         # XXX set SPRs on error
+        return data
 
     # TODO implement
     def st(self, address, v, width=8, swap=True):
@@ -322,9 +324,11 @@ class RADIX:
         pte = self._walk_tree(addr, mode, priv)
 
         # use pte to store at phys address
-        return self.mem.st(pte.value, v, width, swap)
+        res = self.mem.st(pte.value, v, width, swap)
+        self.last_st_addr = self.mem.last_st_addr
 
         # XXX set SPRs on error
+        return res
 
     def memassign(self, addr, sz, val):
         print("memassign", addr, sz, val)