From dbac448b088eea12d8b20400c7a770e57e28d771 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 19 Jan 2009 20:36:49 -0800
Subject: thread_context: move getSystemPtr so SE mode can get to it. There was
 really no reason that it should be FS only.

---
 src/cpu/o3/thread_context.hh      | 2 +-
 src/cpu/o3/thread_context_impl.hh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/cpu/o3')

diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index 8682e071e..6de773ff1 100755
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -86,10 +86,10 @@ class O3ThreadContext : public ThreadContext
     virtual int threadId() { return thread->threadId(); }
     virtual void setThreadId(int id) { return thread->setThreadId(id); }
 
-#if FULL_SYSTEM
     /** Returns a pointer to the system. */
     virtual System *getSystemPtr() { return cpu->system; }
 
+#if FULL_SYSTEM
     /** Returns a pointer to physical memory. */
     virtual PhysicalMemory *getPhysMemPtr() { return cpu->physmem; }
 
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 735827ebc..12b2d1b31 100755
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -54,9 +54,8 @@ void
 O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context)
 {
     // some things should already be set up
-#if FULL_SYSTEM
     assert(getSystemPtr() == old_context->getSystemPtr());
-#else
+#if !FULL_SYSTEM
     assert(getProcessPtr() == old_context->getProcessPtr());
 #endif
 
-- 
cgit v1.2.3