diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-02-24 08:52:38 -0500 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-02-24 08:52:38 -0500 |
| commit | 7a37037358ae5800d0f6a40130929669d836fe70 (patch) | |
| tree | 31b2c9f9033585b7c163319c8abcb80aa7bd26f4 /cpu/o3/cpu.cc | |
| parent | f6cac25dcfbeed77642026deb81979f651104efe (diff) | |
| parent | 51647e7bec8e8607fc5713b4ace2c24ce8a7455a (diff) | |
| download | gem5-7a37037358ae5800d0f6a40130929669d836fe70.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/multiarch
arch/isa_parser.py:
SCCS merged
--HG--
extra : convert_revision : 080cca7616b37db3bf18976b63b3dbcb47d8b918
Diffstat (limited to 'cpu/o3/cpu.cc')
| -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 |