[gem5-dev] changeset in gem5: alpha: Move system virtProxy to Alpha only

[Andreas Hansson]

changeset 29941c87f7b0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=29941c87f7b0
description:
        alpha: Move system virtProxy to Alpha only

        This patch moves the system virtual port proxy to the Alpha system
        only to make the resurrection of the NOISA slightly less
        painful. Alpha is the only ISA that is actually using it.

diffstat:

 src/arch/alpha/system.cc |  2 +-
 src/arch/alpha/system.hh |  6 ++++++
 src/sim/system.cc        |  1 -
 src/sim/system.hh        |  3 +--
 4 files changed, 8 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r a4b5fd8937c9 -r 29941c87f7b0 src/arch/alpha/system.cc
--- a/src/arch/alpha/system.cc  Wed Sep 04 13:22:54 2013 -0400
+++ b/src/arch/alpha/system.cc  Wed Sep 04 13:22:55 2013 -0400
@@ -45,7 +45,7 @@
 using namespace AlphaISA;
 
 AlphaSystem::AlphaSystem(Params *p)
-    : System(p), intrFreq(0)
+    : System(p), intrFreq(0), virtProxy(getSystemPort(), p->cache_line_size)
 {
     consoleSymtab = new SymbolTable;
     palSymtab = new SymbolTable;
diff -r a4b5fd8937c9 -r 29941c87f7b0 src/arch/alpha/system.hh
--- a/src/arch/alpha/system.hh  Wed Sep 04 13:22:54 2013 -0400
+++ b/src/arch/alpha/system.hh  Wed Sep 04 13:22:55 2013 -0400
@@ -38,6 +38,7 @@
 #include "base/loader/symtab.hh"
 #include "cpu/pc_event.hh"
 #include "kern/system_events.hh"
+#include "mem/fs_translating_port_proxy.hh"
 #include "params/AlphaSystem.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
@@ -91,6 +92,11 @@
   protected:
     Tick intrFreq;
 
+    /**
+     * Proxy used to copy arguments directly into kernel memory.
+     */
+    FSTranslatingPortProxy virtProxy;
+
     const Params *params() const { return (const Params *)_params; }
 
 
diff -r a4b5fd8937c9 -r 29941c87f7b0 src/sim/system.cc
--- a/src/sim/system.cc Wed Sep 04 13:22:54 2013 -0400
+++ b/src/sim/system.cc Wed Sep 04 13:22:55 2013 -0400
@@ -79,7 +79,6 @@
       pagePtr(0),
       init_param(p->init_param),
       physProxy(_systemPort, p->cache_line_size),
-      virtProxy(_systemPort, p->cache_line_size),
       loadAddrMask(p->load_addr_mask),
       nextPID(0),
       physmem(name() + ".physmem", p->memories),
diff -r a4b5fd8937c9 -r 29941c87f7b0 src/sim/system.hh
--- a/src/sim/system.hh Wed Sep 04 13:22:54 2013 -0400
+++ b/src/sim/system.hh Wed Sep 04 13:22:55 2013 -0400
@@ -57,9 +57,9 @@
 #include "cpu/pc_event.hh"
 #include "enums/MemoryMode.hh"
 #include "kern/system_events.hh"
-#include "mem/fs_translating_port_proxy.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
+#include "mem/port_proxy.hh"
 #include "mem/physical.hh"
 #include "params/System.hh"
 
@@ -211,7 +211,6 @@
     /** Port to physical memory used for writing object files into ram at
      * boot.*/
     PortProxy physProxy;
-    FSTranslatingPortProxy virtProxy;
 
     /** kernel symbol table */
     SymbolTable *kernelSymtab;
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev