diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 00:32:54 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 00:32:54 -0700 |
| commit | 5b433568f05c6f1b093628c2a90f8383abfc1168 (patch) | |
| tree | bac68683155956bf1a71697f71c810a6a37414f0 /src/cpu/inorder | |
| parent | ca36c01f7e515d8042b141c7912e0f090b121e6e (diff) | |
| download | gem5-5b433568f05c6f1b093628c2a90f8383abfc1168.tar.xz | |
SE/FS: Build the base process class in FS.
Diffstat (limited to 'src/cpu/inorder')
| -rw-r--r-- | src/cpu/inorder/cpu.cc | 2 | ||||
| -rw-r--r-- | src/cpu/inorder/thread_state.hh | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc index 07a013afc..cfc083718 100644 --- a/src/cpu/inorder/cpu.cc +++ b/src/cpu/inorder/cpu.cc @@ -267,7 +267,7 @@ InOrderCPU::InOrderCPU(Params *params) #if FULL_SYSTEM // SMT is not supported in FS mode yet. assert(numThreads == 1); - thread[tid] = new Thread(this, 0); + thread[tid] = new Thread(this, 0, NULL); #else if (tid < (ThreadID)params->workload.size()) { DPRINTF(InOrderCPU, "Workload[%i] process is %#x\n", diff --git a/src/cpu/inorder/thread_state.hh b/src/cpu/inorder/thread_state.hh index 227097569..e4fe76491 100644 --- a/src/cpu/inorder/thread_state.hh +++ b/src/cpu/inorder/thread_state.hh @@ -48,8 +48,8 @@ class FunctionProfile; class ProfileNode; #else class FunctionalMemory; -class Process; #endif +class Process; /** * Class that has various thread state, such as the status, the @@ -76,24 +76,15 @@ class InOrderThreadState : public ThreadState { */ bool trapPending; -#if FULL_SYSTEM - InOrderThreadState(InOrderCPU *_cpu, ThreadID _thread_num) - : ThreadState(reinterpret_cast<BaseCPU*>(_cpu), _thread_num), - cpu(_cpu), inSyscall(0), trapPending(0), lastGradIsBranch(false) - { } -#else InOrderThreadState(InOrderCPU *_cpu, ThreadID _thread_num, Process *_process) : ThreadState(reinterpret_cast<BaseCPU*>(_cpu), _thread_num, _process), cpu(_cpu), inSyscall(0), trapPending(0), lastGradIsBranch(false) { } -#endif -#if !FULL_SYSTEM /** Handles the syscall. */ void syscall(int64_t callnum) { process->syscall(callnum, tc); } -#endif #if FULL_SYSTEM void dumpFuncProfile(); |