Get rid of the Unallocated thread context state.

[gem5.git] / src / arch / sparc / intregfile.cc

diff --git a/src/arch/sparc/intregfile.cc b/src/arch/sparc/intregfile.cc
index 6250b181043122ed091d7e4a813385754764cc5b..54c30d1cc330e4050a9b8db33a85f81e462fcc52 100644 (file)
--- a/src/arch/sparc/intregfile.cc
+++ b/src/arch/sparc/intregfile.cc
@@ -31,6 +31,7 @@
 
 #include "arch/sparc/intregfile.hh"
 #include "base/trace.hh"
+#include "base/misc.hh"
 #include "sim/serialize.hh"
 
 #include <string.h>
@@ -40,110 +41,40 @@ using namespace std;
 
 class Checkpoint;
 
-string SparcISA::getIntRegName(RegIndex index)
-{
-    static std::string intRegName[NumIntArchRegs] =
-        {"g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7",
-         "o0", "o1", "o2", "o3", "o4", "o5", "o6", "o7",
-         "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
-         "i0", "i1", "i2", "i3", "i4", "i5", "i6", "i7"};
-    return intRegName[index];
-}
-
-int IntRegFile::flattenIndex(int reg)
-{
-    int flatIndex = offset[reg >> FrameOffsetBits]
-        | (reg & FrameOffsetMask);
-    DPRINTF(Sparc, "Flattened index %d into %d.\n", reg, flatIndex);
-    return flatIndex;
-}
-
 void IntRegFile::clear()
 {
-    int x;
-    for (x = 0; x < MaxGL; x++)
-        memset(regGlobals[x], 0, sizeof(IntReg) * RegsPerFrame);
-    for(int x = 0; x < 2 * NWindows; x++)
-        memset(regSegments[x], 0, sizeof(IntReg) * RegsPerFrame);
+    memset(regs, 0, sizeof(IntReg) * NumIntRegs);
 }
 
 IntRegFile::IntRegFile()
 {
-    offset[Globals] = 0;
-    regView[Globals] = regGlobals[0];
-    setCWP(0);
     clear();
 }
 
 IntReg IntRegFile::readReg(int intReg)
 {
-    IntReg val;
-    if(intReg < NumIntArchRegs)
-        val = regView[intReg >> FrameOffsetBits][intReg & FrameOffsetMask];
-    else if((intReg -= NumIntArchRegs) < NumMicroIntRegs)
-        val = microRegs[intReg];
-    else
-        panic("Tried to read non-existant integer register %d, %d\n", NumIntArchRegs + NumMicroIntRegs + intReg, intReg);
-
-    DPRINTF(Sparc, "Read register %d = 0x%x\n", intReg, val);
-    return val;
+    DPRINTF(IntRegs, "Read register %d = 0x%x\n", intReg, regs[intReg]);
+    return regs[intReg];
 }
 
 void IntRegFile::setReg(int intReg, const IntReg &val)
 {
     if(intReg)
     {
-        DPRINTF(Sparc, "Wrote register %d = 0x%x\n", intReg, val);
-        if(intReg < NumIntArchRegs)
-            regView[intReg >> FrameOffsetBits][intReg & FrameOffsetMask] = val;
-        else if((intReg -= NumIntArchRegs) < NumMicroIntRegs)
-            microRegs[intReg] = val;
-        else
-            panic("Tried to set non-existant integer register\n");
+        DPRINTF(IntRegs, "Wrote register %d = 0x%x\n", intReg, val);
+        regs[intReg] = val;
     }
-}
-
-//This doesn't effect the actual CWP register.
-//It's purpose is to adjust the view of the register file
-//to what it would be if CWP = cwp.
-void IntRegFile::setCWP(int cwp)
-{
-    int index = ((NWindows - cwp) % NWindows) * 2;
-    offset[Outputs] = FrameOffset + (index * RegsPerFrame);
-    offset[Locals] = FrameOffset + ((index+1) * RegsPerFrame);
-    offset[Inputs] = FrameOffset +
-        (((index+2) % (NWindows * 2)) * RegsPerFrame);
-    regView[Outputs] = regSegments[index];
-    regView[Locals] = regSegments[index+1];
-    regView[Inputs] = regSegments[(index+2) % (NWindows * 2)];
-
-    DPRINTF(Sparc, "Changed the CWP value to %d\n", cwp);
-}
-
-void IntRegFile::setGlobals(int gl)
-{
-    DPRINTF(Sparc, "Now using %d globals\n", gl);
-
-    regView[Globals] = regGlobals[gl];
-    offset[Globals] = RegGlobalOffset + gl * RegsPerFrame;
+    return;
 }
 
 void IntRegFile::serialize(std::ostream &os)
 {
-    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(regs, NumIntRegs);
     SERIALIZE_ARRAY(microRegs, NumMicroIntRegs);
 }
 
 void IntRegFile::unserialize(Checkpoint *cp, const std::string &section)
 {
-    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(regs, NumIntRegs);
     UNSERIALIZE_ARRAY(microRegs, NumMicroIntRegs);
 }