diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2003-11-04 15:15:24 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2003-11-04 15:15:24 -0500 |
| commit | 553df008cfec3f4a0bd86c8e5730bde544c26e3d (patch) | |
| tree | 097b7d4c265beaba027ff490b04d63347a42c336 /cpu/exec_context.hh | |
| parent | a7635fa6ef488b8e44b127c40ab2a6818620145e (diff) | |
| parent | 921b1ee87b6927e7310c747e03efd223d8c65642 (diff) | |
| download | gem5-553df008cfec3f4a0bd86c8e5730bde544c26e3d.tar.xz | |
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
--HG--
extra : convert_revision : 0074df284e85bc2ebe6ccc2dbe765fabda9ab041
Diffstat (limited to 'cpu/exec_context.hh')
| -rw-r--r-- | cpu/exec_context.hh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh index e008e3e13..274a3778b 100644 --- a/cpu/exec_context.hh +++ b/cpu/exec_context.hh @@ -46,6 +46,10 @@ class MemoryController; #include "kern/tru64/kernel_stats.hh" #include "sim/system.hh" +#ifdef FS_MEASURE +#include "sim/sw_context.hh" +#endif + #else // !FULL_SYSTEM #include "sim/prog.hh" @@ -122,6 +126,10 @@ class ExecContext MemoryController *memCtrl; PhysicalMemory *physmem; +#ifdef FS_MEASURE + SWContext *swCtx; +#endif + #else Process *process; |