diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-16 05:06:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-16 05:06:40 -0700 |
| commit | ca36c01f7e515d8042b141c7912e0f090b121e6e (patch) | |
| tree | 8c3a5b1d412564ba1c7b7bd1e14a6c219f03e448 /src/sim/system.hh | |
| parent | 464c485d0c7189e886d241ec36294d8d6b7c196e (diff) | |
| download | gem5-ca36c01f7e515d8042b141c7912e0f090b121e6e.tar.xz | |
SE/FS: Make some system funcs available in SE and FS.
Diffstat (limited to 'src/sim/system.hh')
| -rw-r--r-- | src/sim/system.hh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/sim/system.hh b/src/sim/system.hh index 5b48b5242..37729a397 100644 --- a/src/sim/system.hh +++ b/src/sim/system.hh @@ -113,6 +113,8 @@ class System : public SimObject */ bool isMemory(const Addr addr) const; + Addr pagePtr; + #if FULL_SYSTEM uint64_t init_param; @@ -144,9 +146,7 @@ class System : public SimObject */ Addr loadAddrMask; -#else - - Addr pagePtr; +#endif // FULL_SYSTEM protected: uint64_t nextPID; @@ -163,9 +163,6 @@ class System : public SimObject /** Amount of physical memory that exists */ Addr memSize(); - -#endif // FULL_SYSTEM - protected: Enums::MemoryMode memoryMode; uint64_t workItemsBegin; @@ -284,12 +281,10 @@ class System : public SimObject */ Addr getKernelEntry() const { return kernelEntry; } -#else +#endif Addr new_page(); -#endif // FULL_SYSTEM - int registerThreadContext(ThreadContext *tc, int assigned=-1); void replaceThreadContext(ThreadContext *tc, int context_id); |