diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2011-11-02 02:11:14 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2011-11-02 02:11:14 -0700 |
commit | 8b4a3f4070f6d0af07c3f08dcdbd8b6aa05e34f4 (patch) | |
tree | 181f9eb23643f80043908b1726c71846beae0463 /src/sim/faults.cc | |
parent | fb15604f2c20391ec47bc9727b0fc1eceb4467db (diff) | |
download | gem5-8b4a3f4070f6d0af07c3f08dcdbd8b6aa05e34f4.tar.xz |
SE/FS: Get rid of FULL_SYSTEM in sim.
Diffstat (limited to 'src/sim/faults.cc')
-rw-r--r-- | src/sim/faults.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sim/faults.cc b/src/sim/faults.cc index 6403953db..c409aa95b 100644 --- a/src/sim/faults.cc +++ b/src/sim/faults.cc @@ -36,11 +36,12 @@ #include "debug/Fault.hh" #include "mem/page_table.hh" #include "sim/faults.hh" +#include "sim/full_system.hh" #include "sim/process.hh" void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst) { - if (FULL_SYSTEM) { + if (FullSystem) { DPRINTF(Fault, "Fault %s at PC: %s\n", name(), tc->pcState()); assert(!tc->misspeculating()); } else { @@ -61,11 +62,10 @@ void ReExec::invoke(ThreadContext *tc, StaticInstPtr inst) void GenericPageTableFault::invoke(ThreadContext *tc, StaticInstPtr inst) { bool handled = false; -#if !FULL_SYSTEM - Process *p = tc->getProcessPtr(); - - handled = p->fixupStackFault(vaddr); -#endif + if (!FullSystem) { + Process *p = tc->getProcessPtr(); + handled = p->fixupStackFault(vaddr); + } if (!handled) panic("Page table fault when accessing virtual address %#x\n", vaddr); |