diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-24 18:45:28 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-24 18:45:28 -0500 |
| commit | e66f521d5be35683fc9460b2c4d6b7fb35fad940 (patch) | |
| tree | e290f340b7c1d5d999ee61ca3a4db008ecdc7517 /cpu/o3 | |
| parent | 802fd04f640b34d713f7ef75142e51d3d82559b9 (diff) | |
| parent | 7a37037358ae5800d0f6a40130929669d836fe70 (diff) | |
| download | gem5-e66f521d5be35683fc9460b2c4d6b7fb35fad940.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
SConscript:
arch/alpha/ev5.cc:
dev/alpha_console.cc:
Hand merged
--HG--
extra : convert_revision : 318a671e6803400d3ed086a90e70d6790e4f6b19
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 |