summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-06-22 18:10:17 -0400
committerKevin Lim <ktlim@umich.edu>2006-06-22 18:10:17 -0400
commite6c04b1584998ed2ea532da4070b356c75906f63 (patch)
tree940545a432e9697fd8b630e04757ec18f385ece3 /src
parent6e95bcd333784e1292293980cb2c2fba9f2ac467 (diff)
downloadgem5-e6c04b1584998ed2ea532da4070b356c75906f63.tar.xz
Change ThreadState constructor ordering to match the rest of the ThreadStates.
--HG-- extra : convert_revision : 63d98aa8b6a694c285d95a2a57e1b3aaef4cee3b
Diffstat (limited to 'src')
-rw-r--r--src/cpu/o3/thread_state.hh2
-rw-r--r--src/cpu/simple_thread.cc4
-rw-r--r--src/cpu/thread_state.cc4
-rw-r--r--src/cpu/thread_state.hh4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/cpu/o3/thread_state.hh b/src/cpu/o3/thread_state.hh
index 19cbffb44..1c8105204 100644
--- a/src/cpu/o3/thread_state.hh
+++ b/src/cpu/o3/thread_state.hh
@@ -82,7 +82,7 @@ struct O3ThreadState : public ThreadState {
#else
O3ThreadState(O3CPU *_cpu, int _thread_num, Process *_process, int _asid,
MemObject *mem)
- : ThreadState(-1, _thread_num, mem, _process, _asid),
+ : ThreadState(-1, _thread_num, _process, _asid, mem),
cpu(_cpu), inSyscall(0), trapPending(0)
{ }
#endif
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 48383ca93..db28b23e8 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -107,7 +107,7 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
#else
SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num,
Process *_process, int _asid, MemObject* memobj)
- : ThreadState(-1, _thread_num, memobj, _process, _asid),
+ : ThreadState(-1, _thread_num, _process, _asid, memobj),
cpu(_cpu)
{
/* Use this port to for syscall emulation writes to memory. */
@@ -124,7 +124,7 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num,
}
SimpleThread::SimpleThread(RegFile *regFile)
- : ThreadState(-1, -1, NULL, NULL, -1), cpu(NULL)
+ : ThreadState(-1, -1, NULL, -1, NULL), cpu(NULL)
{
regs = *regFile;
tc = new ProxyThreadContext<SimpleThread>(this);
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index dcfa93c3e..872678a41 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -38,8 +38,8 @@ ThreadState::ThreadState(int _cpuId, int _tid)
profile(NULL), profileNode(NULL), profilePC(0), quiesceEvent(NULL),
funcExeInst(0), storeCondFailures(0)
#else
-ThreadState::ThreadState(int _cpuId, int _tid, MemObject *mem,
- Process *_process, short _asid)
+ThreadState::ThreadState(int _cpuId, int _tid, Process *_process,
+ short _asid, MemObject *mem)
: cpuId(_cpuId), tid(_tid), lastActivate(0), lastSuspend(0),
process(_process), asid(_asid),
funcExeInst(0), storeCondFailures(0)
diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index de9b2f14e..cb1449ac5 100644
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -61,8 +61,8 @@ struct ThreadState {
#if FULL_SYSTEM
ThreadState(int _cpuId, int _tid);
#else
- ThreadState(int _cpuId, int _tid, MemObject *mem,
- Process *_process, short _asid);
+ ThreadState(int _cpuId, int _tid, Process *_process,
+ short _asid, MemObject *mem);
#endif
void setCpuId(int id) { cpuId = id; }