sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
--HG--
extra : convert_revision : 63d98aa8b6a694c285d95a2a57e1b3aaef4cee3b
This commit is contained in:
Kevin Lim 2006-06-22 18:10:17 -04:00
parent 6e95bcd333
commit e6c04b1584
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cpu/o3/thread_state.hh
View file

@ -82,7 +82,7 @@ struct O3ThreadState : public ThreadState {
#else #else
O3ThreadState(O3CPU *_cpu, int _thread_num, Process *_process, int _asid, O3ThreadState(O3CPU *_cpu, int _thread_num, Process *_process, int _asid,
MemObject *mem) MemObject *mem)
: ThreadState(-1, _thread_num, mem, _process, _asid), : ThreadState(-1, _thread_num, _process, _asid, mem),
cpu(_cpu), inSyscall(0), trapPending(0) cpu(_cpu), inSyscall(0), trapPending(0)
{ } { }
#endif #endif

4
src/cpu/simple_thread.cc
View file

@ -107,7 +107,7 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
#else #else
SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num,
Process *_process, int _asid, MemObject* memobj) Process *_process, int _asid, MemObject* memobj)
: ThreadState(-1, _thread_num, memobj, _process, _asid), : ThreadState(-1, _thread_num, _process, _asid, memobj),
cpu(_cpu) cpu(_cpu)
{ {
/* Use this port to for syscall emulation writes to memory. */ /* 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) SimpleThread::SimpleThread(RegFile *regFile)
: ThreadState(-1, -1, NULL, NULL, -1), cpu(NULL) : ThreadState(-1, -1, NULL, -1, NULL), cpu(NULL)
{ {
regs = *regFile; regs = *regFile;
tc = new ProxyThreadContext<SimpleThread>(this); tc = new ProxyThreadContext<SimpleThread>(this);

4
src/cpu/thread_state.cc
View file

@ -38,8 +38,8 @@ ThreadState::ThreadState(int _cpuId, int _tid)
profile(NULL), profileNode(NULL), profilePC(0), quiesceEvent(NULL), profile(NULL), profileNode(NULL), profilePC(0), quiesceEvent(NULL),
funcExeInst(0), storeCondFailures(0) funcExeInst(0), storeCondFailures(0)
#else #else
ThreadState::ThreadState(int _cpuId, int _tid, MemObject *mem, ThreadState::ThreadState(int _cpuId, int _tid, Process *_process,
Process *_process, short _asid) short _asid, MemObject *mem)
: cpuId(_cpuId), tid(_tid), lastActivate(0), lastSuspend(0), : cpuId(_cpuId), tid(_tid), lastActivate(0), lastSuspend(0),
process(_process), asid(_asid), process(_process), asid(_asid),
funcExeInst(0), storeCondFailures(0) funcExeInst(0), storeCondFailures(0)

4
src/cpu/thread_state.hh
View file

@ -61,8 +61,8 @@ struct ThreadState {
#if FULL_SYSTEM #if FULL_SYSTEM
ThreadState(int _cpuId, int _tid); ThreadState(int _cpuId, int _tid);
#else #else
ThreadState(int _cpuId, int _tid, MemObject *mem, ThreadState(int _cpuId, int _tid, Process *_process,
Process *_process, short _asid); short _asid, MemObject *mem);
#endif #endif
void setCpuId(int id) { cpuId = id; } void setCpuId(int id) { cpuId = id; }