summaryrefslogtreecommitdiff
path: root/src/sim/system.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-10-30 02:30:55 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-10-30 02:30:55 -0700
commit0c81db77f218d414e13f4721f19b1f7ac5305592 (patch)
treedce1fdbd020647895540d91b930b4bd16d3f44b2 /src/sim/system.hh
parent1d8822a3647244d2386568f688203a48bda7b49e (diff)
downloadgem5-0c81db77f218d414e13f4721f19b1f7ac5305592.tar.xz
SE/FS: Make the system object more consistent between SE and FS.
Diffstat (limited to 'src/sim/system.hh')
-rw-r--r--src/sim/system.hh29
1 files changed, 9 insertions, 20 deletions
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 37729a397..77d935dbd 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -44,26 +44,20 @@
#include "config/full_system.hh"
#include "cpu/pc_event.hh"
#include "enums/MemoryMode.hh"
+#include "kern/system_events.hh"
#include "mem/port.hh"
#include "params/System.hh"
#include "sim/sim_object.hh"
-#if FULL_SYSTEM
-#include "kern/system_events.hh"
-#endif
-
class BaseCPU;
-class ThreadContext;
+class BaseRemoteGDB;
+class FunctionalPort;
+class GDBListener;
class ObjectFile;
class PhysicalMemory;
-
-#if FULL_SYSTEM
class Platform;
-class FunctionalPort;
+class ThreadContext;
class VirtualPort;
-#endif
-class GDBListener;
-class BaseRemoteGDB;
class System : public SimObject
{
@@ -115,7 +109,6 @@ class System : public SimObject
Addr pagePtr;
-#if FULL_SYSTEM
uint64_t init_param;
/** Port to physical memory used for writing object files into ram at
@@ -146,8 +139,6 @@ class System : public SimObject
*/
Addr loadAddrMask;
-#endif // FULL_SYSTEM
-
protected:
uint64_t nextPID;
@@ -208,13 +199,15 @@ class System : public SimObject
return count;
}
-#if FULL_SYSTEM
/**
* Fix up an address used to match PCs for hooking simulator
* events on to target function executions. See comment in
* system.cc for details.
*/
- virtual Addr fixFuncEventAddr(Addr addr) = 0;
+ virtual Addr fixFuncEventAddr(Addr addr)
+ {
+ panic("Base fixFuncEventAddr not implemented.\n");
+ }
/**
* Add a function-based event to the given function, to be looked
@@ -240,7 +233,6 @@ class System : public SimObject
return addFuncEvent<T>(kernelSymtab, lbl);
}
-#endif
public:
std::vector<BaseRemoteGDB *> remoteGDB;
std::vector<GDBListener *> gdbListen;
@@ -262,7 +254,6 @@ class System : public SimObject
public:
-#if FULL_SYSTEM
/**
* Returns the addess the kernel starts at.
* @return address the kernel starts at
@@ -281,8 +272,6 @@ class System : public SimObject
*/
Addr getKernelEntry() const { return kernelEntry; }
-#endif
-
Addr new_page();
int registerThreadContext(ThreadContext *tc, int assigned=-1);