diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 00:33:02 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 00:33:02 -0700 |
| commit | facb40f3ffce30cd9bc3b904eed5761d2d8b91c9 (patch) | |
| tree | a8db1326da23d56c23058c95cf5bf707fc3208b4 /src/cpu/simple_thread.cc | |
| parent | 5b433568f05c6f1b093628c2a90f8383abfc1168 (diff) | |
| download | gem5-facb40f3ffce30cd9bc3b904eed5761d2d8b91c9.tar.xz | |
SE/FS: Make getProcessPtr available in both modes, and get rid of FULL_SYSTEMs.
Diffstat (limited to 'src/cpu/simple_thread.cc')
| -rw-r--r-- | src/cpu/simple_thread.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index 6b9f60402..53534a4f3 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -41,6 +41,7 @@ #include "cpu/thread_context.hh" #include "mem/vport.hh" #include "params/BaseCPU.hh" +#include "sim/process.hh" #if FULL_SYSTEM #include "arch/kernel_stats.hh" @@ -55,7 +56,6 @@ #include "sim/sim_exit.hh" #else #include "mem/translating_port.hh" -#include "sim/process.hh" #include "sim/system.hh" #endif @@ -123,9 +123,8 @@ SimpleThread::takeOverFrom(ThreadContext *oldContext) // some things should already be set up #if FULL_SYSTEM assert(system == oldContext->getSystemPtr()); -#else - assert(process == oldContext->getProcessPtr()); #endif + assert(process == oldContext->getProcessPtr()); copyState(oldContext); #if FULL_SYSTEM |