diff options
| author | Kevin Lim <ktlim@umich.edu> | 2007-04-04 15:38:59 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2007-04-04 15:38:59 -0400 |
| commit | 6ff6621f20eb6513e12c769f601dba0b47b47697 (patch) | |
| tree | 4a0da2fd882ae94d15361577807ede7111cd4626 /src/cpu/o3/cpu.cc | |
| parent | 9e1f3bc11a0f8cdb3bbb1ce12d4cd77d4c2c96c3 (diff) | |
| download | gem5-6ff6621f20eb6513e12c769f601dba0b47b47697.tar.xz | |
Pass ISA-specific O3 CPU as a constructor parameter instead of using setCPU functions.
src/cpu/o3/alpha/cpu_impl.hh:
Pass ISA-specific O3 CPU to FullO3CPU as a constructor parameter instead of using setCPU functions.
--HG--
extra : convert_revision : 74f4b1f5fb6f95a56081f367cce7ff44acb5688a
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 354e3c490..2e6a43f9c 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -148,7 +148,7 @@ FullO3CPU<Impl>::DeallocateContextEvent::description() } template <class Impl> -FullO3CPU<Impl>::FullO3CPU(Params *params) +FullO3CPU<Impl>::FullO3CPU(O3CPU *o3_cpu, Params *params) : BaseO3CPU(params), #if FULL_SYSTEM itb(params->itb), @@ -156,19 +156,21 @@ FullO3CPU<Impl>::FullO3CPU(Params *params) #endif tickEvent(this), removeInstsThisCycle(false), - fetch(params), - decode(params), - rename(params), - iew(params), - commit(params), + fetch(o3_cpu, params), + decode(o3_cpu, params), + rename(o3_cpu, params), + iew(o3_cpu, params), + commit(o3_cpu, params), - regFile(params->numPhysIntRegs, params->numPhysFloatRegs), + regFile(o3_cpu, params->numPhysIntRegs, + params->numPhysFloatRegs), freeList(params->numberOfThreads, TheISA::NumIntRegs, params->numPhysIntRegs, TheISA::NumFloatRegs, params->numPhysFloatRegs), - rob(params->numROBEntries, params->squashWidth, + rob(o3_cpu, + params->numROBEntries, params->squashWidth, params->smtROBPolicy, params->smtROBThreshold, params->numberOfThreads), |