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/inorder | |
| 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/inorder')
| -rw-r--r-- | src/cpu/inorder/thread_context.cc | 4 | ||||
| -rw-r--r-- | src/cpu/inorder/thread_context.hh | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/cpu/inorder/thread_context.cc b/src/cpu/inorder/thread_context.cc index f5e55627c..8fc6ac75f 100644 --- a/src/cpu/inorder/thread_context.cc +++ b/src/cpu/inorder/thread_context.cc @@ -85,11 +85,7 @@ InOrderThreadContext::takeOverFrom(ThreadContext *old_context) { // some things should already be set up assert(getSystemPtr() == old_context->getSystemPtr()); -#if !FULL_SYSTEM assert(getProcessPtr() == old_context->getProcessPtr()); -#endif - - // copy over functional state setStatus(old_context->status()); diff --git a/src/cpu/inorder/thread_context.hh b/src/cpu/inorder/thread_context.hh index 9b071ee5d..95338c05c 100644 --- a/src/cpu/inorder/thread_context.hh +++ b/src/cpu/inorder/thread_context.hh @@ -142,10 +142,9 @@ class InOrderThreadContext : public ThreadContext { return this->thread->quiesceEvent; } -#else +#endif /** Returns a pointer to this thread's process. */ Process *getProcessPtr() { return thread->getProcessPtr(); } -#endif TranslatingPort *getMemPort() { return thread->getMemPort(); } |