ARM: Implement WFE/WFI/SEV semantics.

[gem5.git] / src / sim / system.cc

diff --git a/src/sim/system.cc b/src/sim/system.cc
index c7f5b2d08f20d4ba7ec24a5d3a0ecbf6bbe484c3..bb8eccf148e908519d16d9a10c25c74661b0f28b 100644 (file)
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2003-2006 The Regents of The University of Michigan
+ * Copyright (c) 2011 Regents of the University of California
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +30,7 @@
  *          Lisa Hsu
  *          Nathan Binkert
  *          Ali Saidi
+ *          Rick Strong
  */
 
 #include "arch/isa_traits.hh"
@@ -37,18 +39,20 @@
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "cpu/thread_context.hh"
+#include "debug/Loader.hh"
 #include "mem/mem_object.hh"
 #include "mem/physical.hh"
 #include "sim/byteswap.hh"
-#include "sim/system.hh"
 #include "sim/debug.hh"
+#include "sim/system.hh"
 
 #if FULL_SYSTEM
 #include "arch/vtophys.hh"
 #include "kern/kernel_stats.hh"
+#include "mem/vport.hh"
 #else
 #include "params/System.hh"
 #endif
@@ -64,13 +68,17 @@ System::System(Params *p)
     : SimObject(p), physmem(p->physmem), _numContexts(0),
 #if FULL_SYSTEM
       init_param(p->init_param),
-      functionalPort(p->name + "-fport"),
-      virtPort(p->name + "-vport"),
+      loadAddrMask(p->load_addr_mask),
 #else
-      page_ptr(0),
-      next_PID(0),
+      pagePtr(0),
+      nextPID(0),
 #endif
-      memoryMode(p->mem_mode), _params(p)
+      memoryMode(p->mem_mode),
+      workItemsBegin(0),
+      workItemsEnd(0),
+      _params(p),
+      totalNumInsts(0), 
+      instEventQueue("system instruction-based event queue")
 {
     // add self to global system list
     systemList.push_back(this);
@@ -85,13 +93,15 @@ System::System(Params *p)
      * Get a functional port to memory
      */
     Port *mem_port;
+    functionalPort = new FunctionalPort(name() + "-fport");
     mem_port = physmem->getPort("functional");
-    functionalPort.setPeer(mem_port);
-    mem_port->setPeer(&functionalPort);
+    functionalPort->setPeer(mem_port);
+    mem_port->setPeer(functionalPort);
 
+    virtPort = new VirtualPort(name() + "-fport");
     mem_port = physmem->getPort("functional");
-    virtPort.setPeer(mem_port);
-    mem_port->setPeer(&virtPort);
+    virtPort->setPeer(mem_port);
+    mem_port->setPeer(virtPort);
 
 
     /**
@@ -109,7 +119,7 @@ System::System(Params *p)
             fatal("Could not load kernel file %s", params()->kernel);
 
         // Load program sections into memory
-        kernel->loadSections(&functionalPort, LoadAddrMask);
+        kernel->loadSections(functionalPort, loadAddrMask);
 
         // setup entry points
         kernelStart = kernel->textBase();
@@ -138,6 +148,8 @@ System::System(Params *p)
 
     // increment the number of running systms
     numSystemsRunning++;
+
+    activeCpus.clear();
 }
 
 System::~System()
@@ -212,6 +224,8 @@ System::registerThreadContext(ThreadContext *tc, int assigned)
         remoteGDB[id] = rgdb;
     }
 
+    activeCpus.push_back(false);
+
     return id;
 }
 
@@ -227,7 +241,7 @@ System::numRunningContexts()
 }
 
 void
-System::startup()
+System::initState()
 {
 #if FULL_SYSTEM
     int i;
@@ -253,8 +267,8 @@ System::replaceThreadContext(ThreadContext *tc, int context_id)
 Addr
 System::new_page()
 {
-    Addr return_addr = page_ptr << LogVMPageSize;
-    ++page_ptr;
+    Addr return_addr = pagePtr << LogVMPageSize;
+    ++pagePtr;
     if (return_addr >= physmem->size())
         fatal("Out of memory, please increase size of physical memory.");
     return return_addr;
@@ -269,18 +283,26 @@ System::memSize()
 Addr
 System::freeMemSize()
 {
-   return physmem->size() - (page_ptr << LogVMPageSize);
+   return physmem->size() - (pagePtr << LogVMPageSize);
 }
 
 #endif
 
+void
+System::resume()
+{
+    SimObject::resume();
+    totalNumInsts = 0;
+}
+
 void
 System::serialize(ostream &os)
 {
 #if FULL_SYSTEM
     kernelSymtab->serialize("kernel_symtab", os);
 #else // !FULL_SYSTEM
-    SERIALIZE_SCALAR(page_ptr);
+    SERIALIZE_SCALAR(pagePtr);
+    SERIALIZE_SCALAR(nextPID);
 #endif
 }
 
@@ -291,7 +313,8 @@ System::unserialize(Checkpoint *cp, const string &section)
 #if FULL_SYSTEM
     kernelSymtab->unserialize("kernel_symtab", cp, section);
 #else // !FULL_SYSTEM
-    UNSERIALIZE_SCALAR(page_ptr);
+    UNSERIALIZE_SCALAR(pagePtr);
+    UNSERIALIZE_SCALAR(nextPID);
 #endif
 }