diff options
Diffstat (limited to 'src/cpu/o3')
| -rwxr-xr-x | src/cpu/o3/thread_context.hh | 3 | ||||
| -rwxr-xr-x | src/cpu/o3/thread_context_impl.hh | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh index 2688e75e1..145d6fd29 100755 --- a/src/cpu/o3/thread_context.hh +++ b/src/cpu/o3/thread_context.hh @@ -98,10 +98,9 @@ class O3ThreadContext : public ThreadContext { return thread->kernelStats; } virtual void connectMemPorts(ThreadContext *tc) { thread->connectMemPorts(tc); } -#else +#endif /** Returns a pointer to this thread's process. */ virtual Process *getProcessPtr() { return thread->getProcessPtr(); } -#endif virtual TranslatingPort *getMemPort() { return thread->getMemPort(); } diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh index 515fa5a50..0952465d4 100755 --- a/src/cpu/o3/thread_context_impl.hh +++ b/src/cpu/o3/thread_context_impl.hh @@ -70,9 +70,8 @@ O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context) // some things should already be set up #if FULL_SYSTEM assert(getSystemPtr() == old_context->getSystemPtr()); -#else - assert(getProcessPtr() == old_context->getProcessPtr()); #endif + assert(getProcessPtr() == old_context->getProcessPtr()); // copy over functional state setStatus(old_context->status()); |