summaryrefslogtreecommitdiff
path: root/src/cpu/thread_state.cc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-10-16 05:06:39 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-10-16 05:06:39 -0700
commit3595b0c5a1a3e398a7efae932cd4175cd1ca3f0e (patch)
tree651320e1a0c7fab8755bab36ba8f49980c1e1e4c /src/cpu/thread_state.cc
parent79ba4b65957ed87907cacadc131f94628277b8db (diff)
downloadgem5-3595b0c5a1a3e398a7efae932cd4175cd1ca3f0e.tar.xz
SE/FS: Build/expose vport in SE mode.
Diffstat (limited to 'src/cpu/thread_state.cc')
-rw-r--r--src/cpu/thread_state.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index 0abe2bf81..a0fd5d7a1 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -34,12 +34,12 @@
#include "cpu/thread_state.hh"
#include "mem/port.hh"
#include "mem/translating_port.hh"
+#include "mem/vport.hh"
#include "sim/serialize.hh"
#if FULL_SYSTEM
#include "arch/kernel_stats.hh"
#include "cpu/quiesce_event.hh"
-#include "mem/vport.hh"
#endif
#if FULL_SYSTEM
@@ -51,11 +51,11 @@ ThreadState::ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process)
baseCpu(cpu), _threadId(_tid), lastActivate(0), lastSuspend(0),
#if FULL_SYSTEM
profile(NULL), profileNode(NULL), profilePC(0), quiesceEvent(NULL),
- kernelStats(NULL), virtPort(NULL),
+ kernelStats(NULL),
#else
port(NULL), process(_process),
#endif
- physPort(NULL), funcExeInst(0), storeCondFailures(0)
+ virtPort(NULL), physPort(NULL), funcExeInst(0), storeCondFailures(0)
{
}
@@ -118,14 +118,6 @@ ThreadState::connectPhysPort()
connectToMemFunc(physPort);
}
-#if FULL_SYSTEM
-void
-ThreadState::connectMemPorts(ThreadContext *tc)
-{
- connectPhysPort();
- connectVirtPort(tc);
-}
-
void
ThreadState::connectVirtPort(ThreadContext *tc)
{
@@ -140,6 +132,14 @@ ThreadState::connectVirtPort(ThreadContext *tc)
connectToMemFunc(virtPort);
}
+#if FULL_SYSTEM
+void
+ThreadState::connectMemPorts(ThreadContext *tc)
+{
+ connectPhysPort();
+ connectVirtPort(tc);
+}
+
void
ThreadState::profileClear()
{