summaryrefslogtreecommitdiff
path: root/src/sim/system.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-07-13 15:50:09 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-07-13 15:50:09 -0400
commitefc06d0545912f4589e86fe32deac98805786ee6 (patch)
tree7655d0f658e0582d9985551d193811d8525d1fbc /src/sim/system.hh
parent1e4acb8e017ce81694c514af21ad817e9b1a078e (diff)
parente1b8e71500b7b66b115345eeaef7216617487456 (diff)
downloadgem5-efc06d0545912f4589e86fe32deac98805786ee6.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem src/python/m5/main.py: merge two help fixes --HG-- extra : convert_revision : b5c4a88bb84b726bebd3e357a4ef29acc0d95600
Diffstat (limited to 'src/sim/system.hh')
-rw-r--r--src/sim/system.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 77777aed4..a1b53c2eb 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -67,6 +67,8 @@ class System : public SimObject
Timing
};
+ static const char *MemoryModeStrings[3];
+
MemoryMode getMemoryMode() { assert(memoryMode); return memoryMode; }
@@ -170,6 +172,7 @@ class System : public SimObject
{
std::string name;
PhysicalMemory *physmem;
+ MemoryMode mem_mode;
#if FULL_SYSTEM
Tick boot_cpu_frequency;