changeset aae3d7089925 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=aae3d7089925
description:
thread_context: move getSystemPtr so SE mode can get to it.
There was really no reason that it should be FS only.
diffstat:
4 files changed, 5 insertions(+), 6 deletions(-)
src/cpu/o3/thread_context.hh | 2 +-
src/cpu/o3/thread_context_impl.hh | 3 +--
src/cpu/simple_thread.hh | 2 +-
src/cpu/thread_context.hh | 4 ++--
diffs (68 lines):
diff -r 1fb28f526602 -r aae3d7089925 src/cpu/o3/thread_context.hh
--- a/src/cpu/o3/thread_context.hh Mon Jan 19 14:43:09 2009 -0800
+++ b/src/cpu/o3/thread_context.hh Mon Jan 19 20:36:49 2009 -0800
@@ -86,10 +86,10 @@
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 -r 1fb28f526602 -r aae3d7089925 src/cpu/o3/thread_context_impl.hh
--- a/src/cpu/o3/thread_context_impl.hh Mon Jan 19 14:43:09 2009 -0800
+++ b/src/cpu/o3/thread_context_impl.hh Mon Jan 19 20:36:49 2009 -0800
@@ -54,9 +54,8 @@
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
diff -r 1fb28f526602 -r aae3d7089925 src/cpu/simple_thread.hh
--- a/src/cpu/simple_thread.hh Mon Jan 19 14:43:09 2009 -0800
+++ b/src/cpu/simple_thread.hh Mon Jan 19 20:36:49 2009 -0800
@@ -201,9 +201,9 @@
TheISA::DTB *getDTBPtr() { return dtb; }
-#if FULL_SYSTEM
System *getSystemPtr() { return system; }
+#if FULL_SYSTEM
FunctionalPort *getPhysPort() { return physPort; }
/** Return a virtual port. This port cannot be cached locally in an object.
diff -r 1fb28f526602 -r aae3d7089925 src/cpu/thread_context.hh
--- a/src/cpu/thread_context.hh Mon Jan 19 14:43:09 2009 -0800
+++ b/src/cpu/thread_context.hh Mon Jan 19 20:36:49 2009 -0800
@@ -129,9 +129,9 @@
virtual TheISA::DTB *getDTBPtr() = 0;
-#if FULL_SYSTEM
virtual System *getSystemPtr() = 0;
+#if FULL_SYSTEM
virtual TheISA::Kernel::Statistics *getKernelStats() = 0;
virtual FunctionalPort *getPhysPort() = 0;
@@ -318,9 +318,9 @@
TheISA::DTB *getDTBPtr() { return actualTC->getDTBPtr(); }
-#if FULL_SYSTEM
System *getSystemPtr() { return actualTC->getSystemPtr(); }
+#if FULL_SYSTEM
TheISA::Kernel::Statistics *getKernelStats()
{ return actualTC->getKernelStats(); }
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
