[gem5-dev] encumbered: EIO: Update for recent memory port changes.

[Steve Reinhardt]

changeset 3d9b7567d0c1 in /z/repo/encumbered
details: http://repo.gem5.org/encumbered?cmd=changeset;node=3d9b7567d0c1
summary: EIO: Update for recent memory port changes.

diffstat:

 eio/eio.cc |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (70 lines):

diff --git a/eio/eio.cc b/eio/eio.cc
--- a/eio/eio.cc
+++ b/eio/eio.cc
@@ -60,7 +60,7 @@
 #include "base/types.hh"
 #include "cpu/thread_context.hh"
 #include "eio/eio.hh"
-#include "mem/translating_port.hh"
+#include "mem/se_translating_port_proxy.hh"
 #include "params/EioProcess.hh"
 #include "sim/byteswap.hh"
 #include "sim/core.hh"
@@ -348,7 +348,7 @@
 
     // Allocate & clear heap, since not all of it will necessarily be
     // initialized from the EIO file (e.g., bss).
-    initVirtMem->memsetBlob(data_base, 0, brk_point - data_base);
+    initVirtMem.memsetBlob(data_base, 0, brk_point - data_base);
 
     /* read stack segment specifiers */
     exo = exo_read(fd);
@@ -384,8 +384,8 @@
        blob = exo->as_list.head->next;
 
        /* write data to simulator memory */
-        initVirtMem->writeBlob(page_addr, blob->as_blob.data,
-                               blob->as_blob.size);
+        initVirtMem.writeBlob(page_addr, blob->as_blob.data,
+                              blob->as_blob.size);
        exo_delete(exo);
     }
 
@@ -475,7 +475,7 @@
        fatal("%s: EIO trace inconsistency: too many input regs", name());
     }
 
-    TranslatingPort *memPort = tc->getMemPort();
+    SETranslatingPortProxy &memPort = tc->getMemProxy();
 
     /* check memory inputs */
     for (memrec = exo_inmem->as_list.head; memrec != NULL;
@@ -498,7 +498,7 @@
            unsigned char val;
 
            /* was: val = MEM_READ_BYTE(loc); */
-           memPort->readBlob(loc, &val, sizeof(unsigned char));
+           memPort.readBlob(loc, &val, sizeof(unsigned char));
 
            if (val != blob->as_blob.data[i]) {
                ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
@@ -536,7 +536,7 @@
     Addr new_brk = (Addr) brkrec->as_integer.val;
     if (new_brk != brk_point) {
         // brk_point has changed; need to allocate more memory
-        initVirtMem->memsetBlob(brk_point, 0, new_brk - brk_point);
+        initVirtMem.memsetBlob(brk_point, 0, new_brk - brk_point);
         brk_point = new_brk;
     }
 
@@ -570,8 +570,8 @@
                  name());
        }
 
-        memPort->writeBlob(addr->as_integer.val, blob->as_blob.data,
-                           blob->as_blob.size);
+        memPort.writeBlob(addr->as_integer.val, blob->as_blob.data,
+                          blob->as_blob.size);
     }
 
     /* release the EIO EXO node */
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev