diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2008-11-02 21:56:57 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2008-11-02 21:56:57 -0500 |
| commit | c55a467a06eaa59c47c52a2adddc266b8e545589 (patch) | |
| tree | e86f0c75e6009285507cd2414b829c122bb0be1f /src/cpu/ozone/cpu_impl.hh | |
| parent | f4bceb9760c93d3b5ff3c2606f7e460b42724670 (diff) | |
| download | gem5-c55a467a06eaa59c47c52a2adddc266b8e545589.tar.xz | |
make BaseCPU the provider of _cpuId, and cpuId() instead of being scattered
across the subclasses. generally make it so that member data is _cpuId and
accessor functions are cpuId(). The ID val comes from the python (default -1 if
none provided), and if it is -1, the index of cpuList will be given. this has
passed util/regress quick and se.py -n4 and fs.py -n4 as well as standard
switch.
Diffstat (limited to 'src/cpu/ozone/cpu_impl.hh')
| -rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index a7efa3596..52376afd8 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -417,7 +417,7 @@ OzoneCPU<Impl>::init() ThreadContext *tc = threadContexts[i]; // initialize CPU, including PC - TheISA::initCPU(tc, tc->readCpuId()); + TheISA::initCPU(tc, tc->cpuId()); } #endif frontEnd->renameTable.copyFrom(thread.renameTable); @@ -803,7 +803,7 @@ OzoneCPU<Impl>::OzoneTC::takeOverFrom(ThreadContext *old_context) // copy over functional state setStatus(old_context->status()); copyArchRegs(old_context); - setCpuId(old_context->readCpuId()); + setCpuId(old_context->cpuId()); thread->setInst(old_context->getInst()); #if !FULL_SYSTEM |