diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-23 15:06:06 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-23 15:06:06 -0500 |
| commit | e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79 (patch) | |
| tree | 490fb46c6254fea699d419d58035a1e0b67eebdd /cpu/o3 | |
| parent | 99484cfae81f3f01ccdfcd273ddc2bdb41e6456b (diff) | |
| parent | 1166d4f0bfe67a9dc178be3454b4f0eac38663ad (diff) | |
| download | gem5-e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79.tar.xz | |
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head
cpu/simple/cpu.cc:
remove initCPU from constructor
dev/alpha_console.cc:
we are panicing, so no need to return a fault
--HG--
extra : convert_revision : 72389ea0c96e91a55f35b884200325224bfb6ed9
Diffstat (limited to 'cpu/o3')
| -rw-r--r-- | cpu/o3/cpu.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpu/o3/cpu.cc b/cpu/o3/cpu.cc index ffa157fbb..706657887 100644 --- a/cpu/o3/cpu.cc +++ b/cpu/o3/cpu.cc @@ -137,8 +137,6 @@ FullO3CPU<Impl>::FullO3CPU(Params ¶ms) system->execContexts[i] = new ExecContext(this, i, system, itb, dtb, mem); - // initialize CPU, including PC - TheISA::initCPU(&system->execContexts[i]->regs); execContexts.push_back(system->execContexts[i]); #else if (i < params.workload.size()) { @@ -250,6 +248,7 @@ FullO3CPU<Impl>::init() // that it can start properly. #if FULL_SYSTEM ExecContext *src_xc = system->execContexts[0]; + TheISA::initCPU(&src_xc->regs, src_xc->cpu_id); #else ExecContext *src_xc = thread[0]; #endif |