summaryrefslogtreecommitdiff
path: root/src/cpu/o3
diff options
context:
space:
mode:
authorTimothy M. Jones <tjones1@inf.ed.ac.uk>2010-06-23 00:53:17 +0100
committerTimothy M. Jones <tjones1@inf.ed.ac.uk>2010-06-23 00:53:17 +0100
commit96767fc7210e952d5874433b7f79a055c9bd692d (patch)
tree1e98459b62724e64e452ee2a8ed4e866b01c7f19 /src/cpu/o3
parent625854785bee062d641934c779cb019348d11760 (diff)
downloadgem5-96767fc7210e952d5874433b7f79a055c9bd692d.tar.xz
O3ThreadContext: When taking over from a previous context, only assert that
the system pointers match in Full System mode.
Diffstat (limited to 'src/cpu/o3')
-rwxr-xr-xsrc/cpu/o3/thread_context_impl.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 940d460ce..a1a96933a 100755
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -55,8 +55,9 @@ void
O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context)
{
// some things should already be set up
+#if FULL_SYSTEM
assert(getSystemPtr() == old_context->getSystemPtr());
-#if !FULL_SYSTEM
+#else
assert(getProcessPtr() == old_context->getProcessPtr());
#endif