Change ThreadState constructor ordering to match the rest of the ThreadStates.

--HG--
extra : convert_revision : 63d98aa8b6a694c285d95a2a57e1b3aaef4cee3b

diff --git a/src/cpu/o3/thread_state.hh b/src/cpu/o3/thread_state.hh
index 19cbffb4446a5a3d25991076229bc73cd128e6fc..1c81052042e72ff50c1074f5a204eb01b4b0d997 100644 (file)
--- 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 48383ca9308dd68922ecf6006227f04e9b6eda75..db28b23e8562ef9d46094982ad74935e1f7fb5b9 100644 (file)
--- 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 dcfa93c3e9101d2b4b1688f41d31981610b98251..872678a41cecc0fd38c646a0e4f9758d38a2f484 100644 (file)
--- 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 de9b2f14e4fc866dfcec2af3808f988f60dfd0b6..cb1449ac5cb12b64fe7196eaa9ccbc5d902b5e45 100644 (file)
--- 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; }