diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-02-28 15:16:24 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-02-28 15:16:24 -0500 |
| commit | 34da58a698e4119876f04d13c337e9974970f49a (patch) | |
| tree | 6dc9940bf89b04ec973ff4b433a015e13cb7f017 /cpu/o3/cpu.cc | |
| parent | 3a362d04b7aed0fa728af9373bad175a096a7de8 (diff) | |
| parent | 96fd6b5c4039c98a1b536ec184126ad75e7d2539 (diff) | |
| download | gem5-34da58a698e4119876f04d13c337e9974970f49a.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean
arch/alpha/ev5.cc:
cpu/o3/regfile.hh:
Hand merge.
--HG--
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
extra : convert_revision : c941dd2198851398820b38a66471372ed8454891
Diffstat (limited to 'cpu/o3/cpu.cc')
| -rw-r--r-- | cpu/o3/cpu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/o3/cpu.cc b/cpu/o3/cpu.cc index 706657887..a8c620028 100644 --- a/cpu/o3/cpu.cc +++ b/cpu/o3/cpu.cc @@ -264,13 +264,13 @@ FullO3CPU<Impl>::init() regFile.floatRegFile[i].d = src_xc->regs.floatRegFile.d[i]; regFile.floatRegFile[i].q = src_xc->regs.floatRegFile.q[i]; } - +/* // Then loop through the misc registers. regFile.miscRegs.fpcr = src_xc->regs.miscRegs.fpcr; regFile.miscRegs.uniq = src_xc->regs.miscRegs.uniq; regFile.miscRegs.lock_flag = src_xc->regs.miscRegs.lock_flag; regFile.miscRegs.lock_addr = src_xc->regs.miscRegs.lock_addr; - +*/ // Then finally set the PC and the next PC. regFile.pc = src_xc->regs.pc; regFile.npc = src_xc->regs.npc; |