diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-30 18:27:16 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-30 18:27:16 -0500 |
commit | 36a1912bf01433acc86837ed60da6d510323aa1e (patch) | |
tree | 7d9c35533d7e6a1c46cd75b98658bf6e46a55d48 /src/arch/sparc/intregfile.cc | |
parent | cf0ba1dfb09c0e16201d963b76078625dc7adca4 (diff) | |
parent | ac36fb6e64dadb9eef5c48863b42969a61bbdaec (diff) | |
download | gem5-36a1912bf01433acc86837ed60da6d510323aa1e.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 276b640c5c5a51e88e9bd630960ad462d9f0cb8d
Diffstat (limited to 'src/arch/sparc/intregfile.cc')
-rw-r--r-- | src/arch/sparc/intregfile.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/arch/sparc/intregfile.cc b/src/arch/sparc/intregfile.cc index 2c9d9b162..39a613a0d 100644 --- a/src/arch/sparc/intregfile.cc +++ b/src/arch/sparc/intregfile.cc @@ -81,6 +81,8 @@ IntReg IntRegFile::readReg(int intReg) { DPRINTF(Sparc, "Read register %d = 0x%x\n", intReg, regs[intReg]); return regs[intReg]; + /* XXX Currently not used. When used again regView/offset need to be + * serialized! IntReg val; if(intReg < NumIntArchRegs) val = regView[intReg >> FrameOffsetBits][intReg & FrameOffsetMask]; @@ -92,6 +94,7 @@ IntReg IntRegFile::readReg(int intReg) DPRINTF(Sparc, "Read register %d = 0x%x\n", intReg, val); return val; + */ } void IntRegFile::setReg(int intReg, const IntReg &val) @@ -102,6 +105,8 @@ void IntRegFile::setReg(int intReg, const IntReg &val) regs[intReg] = val; } return; + /* XXX Currently not used. When used again regView/offset need to be + * serialized! if(intReg) { DPRINTF(Sparc, "Wrote register %d = 0x%x\n", intReg, val); @@ -111,7 +116,7 @@ void IntRegFile::setReg(int intReg, const IntReg &val) microRegs[intReg] = val; else panic("Tried to set non-existant integer register\n"); - } + } */ } //This doesn't effect the actual CWP register. @@ -148,20 +153,26 @@ void IntRegFile::setGlobals(int gl) void IntRegFile::serialize(std::ostream &os) { + SERIALIZE_ARRAY(regs, NumIntRegs); + SERIALIZE_ARRAY(microRegs, NumMicroIntRegs); + + /* the below doesn't seem needed unless gabe makes regview work*/ unsigned int x; for(x = 0; x < MaxGL; x++) SERIALIZE_ARRAY(regGlobals[x], RegsPerFrame); for(x = 0; x < 2 * NWindows; x++) SERIALIZE_ARRAY(regSegments[x], RegsPerFrame); - SERIALIZE_ARRAY(microRegs, NumMicroIntRegs); } void IntRegFile::unserialize(Checkpoint *cp, const std::string §ion) { + UNSERIALIZE_ARRAY(regs, NumIntRegs); + UNSERIALIZE_ARRAY(microRegs, NumMicroIntRegs); + + /* the below doesn't seem needed unless gabe makes regview work*/ unsigned int x; for(x = 0; x < MaxGL; x++) UNSERIALIZE_ARRAY(regGlobals[x], RegsPerFrame); for(unsigned int x = 0; x < 2 * NWindows; x++) UNSERIALIZE_ARRAY(regSegments[x], RegsPerFrame); - UNSERIALIZE_ARRAY(microRegs, NumMicroIntRegs); } |