SE/FS: Make getProcessPtr available in both modes, and get rid of FULL_SYSTEMs.

This commit is contained in:
Gabe Black
2011-10-30 00:33:02 -07:00
parent 5b433568f0
commit facb40f3ff
18 changed files with 118 additions and 295 deletions

View File

@@ -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(); }

View File

@@ -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());