1 files changed, 93 insertions, 13 deletions

diff --git a/sim/system.cc b/sim/system.cc
index 8820922c1..ca9d68d77 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -1,16 +1,18 @@
+#include "arch/isa_traits.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
-#include "base/remote_gdb.hh"
+#include "base/trace.hh"
 #include "cpu/exec_context.hh"
-#include "kern/kernel_stats.hh"
-#include "mem/functional/memory_control.hh"
-#include "mem/functional/physical.hh"
-#include "arch/vtophys.hh"
+#include "mem/mem_object.hh"
+#include "mem/physical.hh"
 #include "sim/builder.hh"
-#include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"
 #include "sim/system.hh"
-#include "base/trace.hh"
+#if FULL_SYSTEM
+#include "arch/vtophys.hh"
+#include "base/remote_gdb.hh"
+#include "kern/kernel_stats.hh"
+#endif
 
 using namespace std;
 using namespace TheISA;
@@ -20,15 +22,35 @@ vector<System *> System::systemList;
 int System::numSystemsRunning = 0;
 
 System::System(Params *p)
-    : SimObject(p->name), memctrl(p->memctrl), physmem(p->physmem),
-      init_param(p->init_param), numcpus(0), _params(p)
+    : SimObject(p->name), physmem(p->physmem), numcpus(0),
+#if FULL_SYSTEM
+      init_param(p->init_param),
+#else
+      page_ptr(0),
+#endif
+      _params(p)
 {
     // add self to global system list
     systemList.push_back(this);
 
+#if FULL_SYSTEM
     kernelSymtab = new SymbolTable;
     debugSymbolTable = new SymbolTable;
 
+
+    /**
+     * Get a functional port to memory
+     */
+    Port *mem_port;
+    mem_port = physmem->getPort("functional");
+    functionalPort.setPeer(mem_port);
+    mem_port->setPeer(&functionalPort);
+
+    mem_port = physmem->getPort("functional");
+    virtPort.setPeer(mem_port);
+    mem_port->setPeer(&virtPort);
+
+
     /**
      * Load the kernel code into memory
      */
@@ -38,7 +60,7 @@ System::System(Params *p)
         fatal("Could not load kernel file %s", params()->kernel_path);
 
     // Load program sections into memory
-    kernel->loadSections(physmem, true);
+    kernel->loadSections(&functionalPort, LoadAddrMask);
 
     // setup entry points
     kernelStart = kernel->textBase();
@@ -63,25 +85,33 @@ System::System(Params *p)
     DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
     DPRINTF(Loader, "Kernel loaded...\n");
 
+    kernelBinning = new Kernel::Binning(this);
+#endif // FULL_SYSTEM
+
     // increment the number of running systms
     numSystemsRunning++;
-
-    kernelBinning = new Kernel::Binning(this);
 }
 
 System::~System()
 {
+#if FULL_SYSTEM
     delete kernelSymtab;
     delete kernel;
 
     delete kernelBinning;
+#else
+    panic("System::fixFuncEventAddr needs to be rewritten "
+          "to work with syscall emulation");
+#endif // FULL_SYSTEM}
 }
 
-
+#if FULL_SYSTEM
 
 
 int rgdb_wait = -1;
 
+#endif // FULL_SYSTEM
+
 int
 System::registerExecContext(ExecContext *xc, int id)
 {
@@ -101,6 +131,7 @@ System::registerExecContext(ExecContext *xc, int id)
     execContexts[id] = xc;
     numcpus++;
 
+#if FULL_SYSTEM
     RemoteGDB *rgdb = new RemoteGDB(this, xc);
     GDBListener *gdbl = new GDBListener(rgdb, 7000 + id);
     gdbl->listen();
@@ -116,6 +147,7 @@ System::registerExecContext(ExecContext *xc, int id)
     }
 
     remoteGDB[id] = rgdb;
+#endif // FULL_SYSTEM
 
     return id;
 }
@@ -137,30 +169,48 @@ System::replaceExecContext(ExecContext *xc, int id)
     }
 
     execContexts[id] = xc;
+#if FULL_SYSTEM
     remoteGDB[id]->replaceExecContext(xc);
+#endif // FULL_SYSTEM
+}
+
+#if !FULL_SYSTEM
+Addr
+System::new_page()
+{
+    Addr return_addr = page_ptr << LogVMPageSize;
+    ++page_ptr;
+    return return_addr;
 }
+#endif
 
 void
 System::regStats()
 {
+#if FULL_SYSTEM
     kernelBinning->regStats(name() + ".kern");
+#endif // FULL_SYSTEM
 }
 
 void
 System::serialize(ostream &os)
 {
+#if FULL_SYSTEM
     kernelBinning->serialize(os);
 
     kernelSymtab->serialize("kernel_symtab", os);
+#endif // FULL_SYSTEM
 }
 
 
 void
 System::unserialize(Checkpoint *cp, const string &section)
 {
+#if FULL_SYSTEM
     kernelBinning->unserialize(cp, section);
 
     kernelSymtab->unserialize("kernel_symtab", cp, section);
+#endif // FULL_SYSTEM
 }
 
 void
@@ -181,5 +231,35 @@ printSystems()
     System::printSystems();
 }
 
+#if FULL_SYSTEM
+
+// In full system mode, only derived classes (e.g. AlphaLinuxSystem)
+// can be created directly.
+
 DEFINE_SIM_OBJECT_CLASS_NAME("System", System)
 
+#else
+
+BEGIN_DECLARE_SIM_OBJECT_PARAMS(System)
+
+    SimObjectParam<PhysicalMemory *> physmem;
+
+END_DECLARE_SIM_OBJECT_PARAMS(System)
+
+BEGIN_INIT_SIM_OBJECT_PARAMS(System)
+
+    INIT_PARAM(physmem, "physical memory")
+
+END_INIT_SIM_OBJECT_PARAMS(System)
+
+CREATE_SIM_OBJECT(System)
+{
+    System::Params *p = new System::Params;
+    p->name = getInstanceName();
+    p->physmem = physmem;
+    return new System(p);
+}
+
+REGISTER_SIM_OBJECT("System", System)
+
+#endif