diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-02-27 12:09:08 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-02-27 12:09:08 -0500 |
commit | 96fd6b5c4039c98a1b536ec184126ad75e7d2539 (patch) | |
tree | f48350603bf2d02cd1ea32bbe0012624c6a82a6f /cpu/o3/cpu.cc | |
parent | 29f50d934549f10b073a5492bd0d441d71534ace (diff) | |
parent | 70b35bab5778799805fe9b6040b23eb1885dbfc3 (diff) | |
download | gem5-96fd6b5c4039c98a1b536ec184126ad75e7d2539.tar.xz |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean
--HG--
extra : convert_revision : 97c345f0715a347ce34f9cabd994485f30f2e171
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; |