Update the Memtester, commit a config file/test for it.
[gem5.git] / src / sim / system.cc
index 7953607d56365a36159ac62860927699164e74b2..11ae492b99c36976ecca019a8f57ac262aeae018 100644 (file)
@@ -63,7 +63,7 @@ System::System(Params *p)
 #else
       page_ptr(0),
 #endif
-      _params(p)
+      memoryMode(p->mem_mode), _params(p)
 {
     // add self to global system list
     systemList.push_back(this);
@@ -119,8 +119,6 @@ System::System(Params *p)
     DPRINTF(Loader, "Kernel end   = %#x\n", kernelEnd);
     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
@@ -132,8 +130,6 @@ System::~System()
 #if FULL_SYSTEM
     delete kernelSymtab;
     delete kernel;
-
-    delete kernelBinning;
 #else
     panic("System::fixFuncEventAddr needs to be rewritten "
           "to work with syscall emulation");
@@ -147,6 +143,14 @@ int rgdb_wait = -1;
 
 #endif // FULL_SYSTEM
 
+
+void
+System::setMemoryMode(MemoryMode mode)
+{
+    assert(getState() == Drained);
+    memoryMode = mode;
+}
+
 int
 System::registerThreadContext(ThreadContext *tc, int id)
 {
@@ -215,24 +219,16 @@ System::new_page()
 {
     Addr return_addr = page_ptr << LogVMPageSize;
     ++page_ptr;
+    if (return_addr >= physmem->size())
+        fatal("Out of memory, please increase size of physical memory.");
     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
 }
@@ -242,8 +238,6 @@ void
 System::unserialize(Checkpoint *cp, const string &section)
 {
 #if FULL_SYSTEM
-    kernelBinning->unserialize(cp, section);
-
     kernelSymtab->unserialize("kernel_symtab", cp, section);
 #endif // FULL_SYSTEM
 }
@@ -259,13 +253,15 @@ System::printSystems()
     }
 }
 
-extern "C"
 void
 printSystems()
 {
     System::printSystems();
 }
 
+const char *System::MemoryModeStrings[3] = {"invalid", "atomic",
+    "timing"};
+
 #if FULL_SYSTEM
 
 // In full system mode, only derived classes (e.g. AlphaLinuxSystem)
@@ -278,12 +274,15 @@ DEFINE_SIM_OBJECT_CLASS_NAME("System", System)
 BEGIN_DECLARE_SIM_OBJECT_PARAMS(System)
 
     SimObjectParam<PhysicalMemory *> physmem;
+    SimpleEnumParam<System::MemoryMode> mem_mode;
 
 END_DECLARE_SIM_OBJECT_PARAMS(System)
 
 BEGIN_INIT_SIM_OBJECT_PARAMS(System)
 
-    INIT_PARAM(physmem, "physical memory")
+    INIT_PARAM(physmem, "physical memory"),
+    INIT_ENUM_PARAM(mem_mode, "Memory Mode, (1=atomic, 2=timing)",
+            System::MemoryModeStrings)
 
 END_INIT_SIM_OBJECT_PARAMS(System)
 
@@ -292,6 +291,7 @@ CREATE_SIM_OBJECT(System)
     System::Params *p = new System::Params;
     p->name = getInstanceName();
     p->physmem = physmem;
+    p->mem_mode = mem_mode;
     return new System(p);
 }