forgot to commit miscreg file

--HG--
extra : convert_revision : c2ede9efbf7b264c32d5565d3f0fc0601c4cd63b

1 files changed, 409 insertions, 480 deletions

diff --git a/src/arch/sparc/miscregfile.cc b/src/arch/sparc/miscregfile.cc
index 046d811e0..67690bdb3 100644
--- a/src/arch/sparc/miscregfile.cc
+++ b/src/arch/sparc/miscregfile.cc
@@ -37,10 +37,6 @@
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 
-#if FULL_SYSTEM
-#include "arch/sparc/system.hh"
-#endif
-
 using namespace SparcISA;
 using namespace std;
 
@@ -50,15 +46,15 @@ class Checkpoint;
 string SparcISA::getMiscRegName(RegIndex index)
 {
     static::string miscRegName[NumMiscRegs] =
-        {"y", "ccr", "asi", "tick", "fprs", "pcr", "pic",
-         "gsr", "softint_set", "softint_clr", "softint", "tick_cmpr",
-         "stick", "stick_cmpr",
-         "tpc", "tnpc", "tstate", "tt", "privtick", "tba", "pstate", "tl",
-         "pil", "cwp", "cansave", "canrestore", "cleanwin", "otherwin",
-         "wstate", "gl",
-         "hpstate", "htstate", "hintp", "htba", "hver", "strand_sts_reg",
-         "hstick_cmpr",
-         "fsr"};
+       {"y", "ccr", "asi", "tick", "fprs", "pcr", "pic",
+        "gsr", "softint_set", "softint_clr", "softint", "tick_cmpr",
+        "stick", "stick_cmpr",
+        "tpc", "tnpc", "tstate", "tt", "privtick", "tba", "pstate", "tl",
+        "pil", "cwp", "cansave", "canrestore", "cleanwin", "otherwin",
+        "wstate", "gl",
+        "hpstate", "htstate", "hintp", "htba", "hver", "strand_sts_reg",
+        "hstick_cmpr",
+        "fsr"};
     return miscRegName[index];
 }
 
@@ -133,149 +129,149 @@ void MiscRegFile::clear()
 MiscReg MiscRegFile::readReg(int miscReg)
 {
     switch (miscReg) {
-        case MISCREG_Y:
-          return y;
-        case MISCREG_CCR:
-          return ccr;
-        case MISCREG_ASI:
-          return asi;
-        case MISCREG_FPRS:
-          return fprs;
-        case MISCREG_TICK:
-           return tick;
-        case MISCREG_PCR:
-          panic("PCR not implemented\n");
-        case MISCREG_PIC:
-          panic("PIC not implemented\n");
-        case MISCREG_GSR:
-          return gsr;
-        case MISCREG_SOFTINT:
-           return softint;
-        case MISCREG_TICK_CMPR:
-           return tick_cmpr;
-        case MISCREG_STICK:
-           return stick;
-        case MISCREG_STICK_CMPR:
-           return stick_cmpr;
+      case MISCREG_Y:
+        return y;
+      case MISCREG_CCR:
+        return ccr;
+      case MISCREG_ASI:
+        return asi;
+      case MISCREG_FPRS:
+        return fprs;
+      case MISCREG_TICK:
+        return tick;
+      case MISCREG_PCR:
+        panic("PCR not implemented\n");
+      case MISCREG_PIC:
+        panic("PIC not implemented\n");
+      case MISCREG_GSR:
+        return gsr;
+      case MISCREG_SOFTINT:
+        return softint;
+      case MISCREG_TICK_CMPR:
+        return tick_cmpr;
+      case MISCREG_STICK:
+        return stick;
+      case MISCREG_STICK_CMPR:
+        return stick_cmpr;
 
         /** Privilged Registers */
-        case MISCREG_TPC:
-          return tpc[tl-1];
-        case MISCREG_TNPC:
-          return tnpc[tl-1];
-        case MISCREG_TSTATE:
-          return tstate[tl-1];
-        case MISCREG_TT:
-          return tt[tl-1];
-        case MISCREG_PRIVTICK:
-          panic("Priviliged access to tick registers not implemented\n");
-        case MISCREG_TBA:
-          return tba;
-        case MISCREG_PSTATE:
-          return pstate;
-        case MISCREG_TL:
-          return tl;
-        case MISCREG_PIL:
-          return pil;
-        case MISCREG_CWP:
-          return cwp;
-        case MISCREG_CANSAVE:
-          return cansave;
-        case MISCREG_CANRESTORE:
-          return canrestore;
-        case MISCREG_CLEANWIN:
-          return cleanwin;
-        case MISCREG_OTHERWIN:
-          return otherwin;
-        case MISCREG_WSTATE:
-          return wstate;
-        case MISCREG_GL:
-          return gl;
+      case MISCREG_TPC:
+        return tpc[tl-1];
+      case MISCREG_TNPC:
+        return tnpc[tl-1];
+      case MISCREG_TSTATE:
+        return tstate[tl-1];
+      case MISCREG_TT:
+        return tt[tl-1];
+      case MISCREG_PRIVTICK:
+        panic("Priviliged access to tick registers not implemented\n");
+      case MISCREG_TBA:
+        return tba;
+      case MISCREG_PSTATE:
+        return pstate;
+      case MISCREG_TL:
+        return tl;
+      case MISCREG_PIL:
+        return pil;
+      case MISCREG_CWP:
+        return cwp;
+      case MISCREG_CANSAVE:
+        return cansave;
+      case MISCREG_CANRESTORE:
+        return canrestore;
+      case MISCREG_CLEANWIN:
+        return cleanwin;
+      case MISCREG_OTHERWIN:
+        return otherwin;
+      case MISCREG_WSTATE:
+        return wstate;
+      case MISCREG_GL:
+        return gl;
 
         /** Hyper privileged registers */
-        case MISCREG_HPSTATE:
-          return hpstate;
-        case MISCREG_HTSTATE:
-          return htstate[tl-1];
-        case MISCREG_HINTP:
-          panic("HINTP not implemented\n");
-        case MISCREG_HTBA:
-          return htba;
-        case MISCREG_HVER:
-          return NWindows | MaxTL << 8 | MaxGL << 16;
-        case MISCREG_STRAND_STS_REG:
-          return strandStatusReg;
-        case MISCREG_HSTICK_CMPR:
-          return hstick_cmpr;
+      case MISCREG_HPSTATE:
+        return hpstate;
+      case MISCREG_HTSTATE:
+        return htstate[tl-1];
+      case MISCREG_HINTP:
+        panic("HINTP not implemented\n");
+      case MISCREG_HTBA:
+        return htba;
+      case MISCREG_HVER:
+        return NWindows | MaxTL << 8 | MaxGL << 16;
+      case MISCREG_STRAND_STS_REG:
+        return strandStatusReg;
+      case MISCREG_HSTICK_CMPR:
+        return hstick_cmpr;
 
         /** Floating Point Status Register */
-        case MISCREG_FSR:
-          return fsr;
-
-        case MISCREG_MMU_P_CONTEXT:
-          return priContext;
-        case MISCREG_MMU_S_CONTEXT:
-          return secContext;
-        case MISCREG_MMU_PART_ID:
-          return partId;
-        case MISCREG_MMU_LSU_CTRL:
-          return lsuCtrlReg;
-
-        case MISCREG_MMU_ITLB_C0_TSB_PS0:
-          return iTlbC0TsbPs0;
-        case MISCREG_MMU_ITLB_C0_TSB_PS1:
-          return iTlbC0TsbPs1;
-        case MISCREG_MMU_ITLB_C0_CONFIG:
-          return iTlbC0Config;
-        case MISCREG_MMU_ITLB_CX_TSB_PS0:
-          return iTlbCXTsbPs0;
-        case MISCREG_MMU_ITLB_CX_TSB_PS1:
-          return iTlbCXTsbPs1;
-        case MISCREG_MMU_ITLB_CX_CONFIG:
-          return iTlbCXConfig;
-        case MISCREG_MMU_ITLB_SFSR:
-          return iTlbSfsr;
-        case MISCREG_MMU_ITLB_TAG_ACCESS:
-          return iTlbTagAccess;
-
-        case MISCREG_MMU_DTLB_C0_TSB_PS0:
-          return dTlbC0TsbPs0;
-        case MISCREG_MMU_DTLB_C0_TSB_PS1:
-          return dTlbC0TsbPs1;
-        case MISCREG_MMU_DTLB_C0_CONFIG:
-          return dTlbC0Config;
-        case MISCREG_MMU_DTLB_CX_TSB_PS0:
-          return dTlbCXTsbPs0;
-        case MISCREG_MMU_DTLB_CX_TSB_PS1:
-          return dTlbCXTsbPs1;
-        case MISCREG_MMU_DTLB_CX_CONFIG:
-          return dTlbCXConfig;
-        case MISCREG_MMU_DTLB_SFSR:
-          return dTlbSfsr;
-        case MISCREG_MMU_DTLB_SFAR:
-          return dTlbSfar;
-        case MISCREG_MMU_DTLB_TAG_ACCESS:
-          return dTlbTagAccess;
-
-        case MISCREG_SCRATCHPAD_R0:
-          return scratchPad[0];
-        case MISCREG_SCRATCHPAD_R1:
-          return scratchPad[1];
-        case MISCREG_SCRATCHPAD_R2:
-          return scratchPad[2];
-        case MISCREG_SCRATCHPAD_R3:
-          return scratchPad[3];
-        case MISCREG_SCRATCHPAD_R4:
-          return scratchPad[4];
-        case MISCREG_SCRATCHPAD_R5:
-          return scratchPad[5];
-        case MISCREG_SCRATCHPAD_R6:
-          return scratchPad[6];
-        case MISCREG_SCRATCHPAD_R7:
-          return scratchPad[7];
-
-        default:
-          panic("Miscellaneous register %d not implemented\n", miscReg);
+      case MISCREG_FSR:
+        return fsr;
+
+      case MISCREG_MMU_P_CONTEXT:
+        return priContext;
+      case MISCREG_MMU_S_CONTEXT:
+        return secContext;
+      case MISCREG_MMU_PART_ID:
+        return partId;
+      case MISCREG_MMU_LSU_CTRL:
+        return lsuCtrlReg;
+
+      case MISCREG_MMU_ITLB_C0_TSB_PS0:
+        return iTlbC0TsbPs0;
+      case MISCREG_MMU_ITLB_C0_TSB_PS1:
+        return iTlbC0TsbPs1;
+      case MISCREG_MMU_ITLB_C0_CONFIG:
+        return iTlbC0Config;
+      case MISCREG_MMU_ITLB_CX_TSB_PS0:
+        return iTlbCXTsbPs0;
+      case MISCREG_MMU_ITLB_CX_TSB_PS1:
+        return iTlbCXTsbPs1;
+      case MISCREG_MMU_ITLB_CX_CONFIG:
+        return iTlbCXConfig;
+      case MISCREG_MMU_ITLB_SFSR:
+        return iTlbSfsr;
+      case MISCREG_MMU_ITLB_TAG_ACCESS:
+        return iTlbTagAccess;
+
+      case MISCREG_MMU_DTLB_C0_TSB_PS0:
+        return dTlbC0TsbPs0;
+      case MISCREG_MMU_DTLB_C0_TSB_PS1:
+        return dTlbC0TsbPs1;
+      case MISCREG_MMU_DTLB_C0_CONFIG:
+        return dTlbC0Config;
+      case MISCREG_MMU_DTLB_CX_TSB_PS0:
+        return dTlbCXTsbPs0;
+      case MISCREG_MMU_DTLB_CX_TSB_PS1:
+        return dTlbCXTsbPs1;
+      case MISCREG_MMU_DTLB_CX_CONFIG:
+        return dTlbCXConfig;
+      case MISCREG_MMU_DTLB_SFSR:
+        return dTlbSfsr;
+      case MISCREG_MMU_DTLB_SFAR:
+        return dTlbSfar;
+      case MISCREG_MMU_DTLB_TAG_ACCESS:
+        return dTlbTagAccess;
+
+      case MISCREG_SCRATCHPAD_R0:
+        return scratchPad[0];
+      case MISCREG_SCRATCHPAD_R1:
+        return scratchPad[1];
+      case MISCREG_SCRATCHPAD_R2:
+        return scratchPad[2];
+      case MISCREG_SCRATCHPAD_R3:
+        return scratchPad[3];
+      case MISCREG_SCRATCHPAD_R4:
+        return scratchPad[4];
+      case MISCREG_SCRATCHPAD_R5:
+        return scratchPad[5];
+      case MISCREG_SCRATCHPAD_R6:
+        return scratchPad[6];
+      case MISCREG_SCRATCHPAD_R7:
+        return scratchPad[7];
+
+      default:
+        panic("Miscellaneous register %d not implemented\n", miscReg);
     }
 }
 
@@ -283,37 +279,42 @@ MiscReg MiscRegFile::readRegWithEffect(int miscReg, ThreadContext * tc)
 {
     switch (miscReg) {
         // tick and stick are aliased to each other in niagra
-        case MISCREG_STICK:
-        case MISCREG_TICK:
-        case MISCREG_PRIVTICK:
-          // I'm not sure why legion ignores the lowest two bits, but we'll go
-          // with it
-          // change from curCycle() to instCount() until we're done with legion
-          DPRINTFN("Instruction Count when STICK read: %#X\n",
-                  tc->getCpuPtr()->instCount());
-          uint64_t t1 =  mbits(tc->getCpuPtr()->instCount() - (tick &
-                      mask(63)),62,2);
-          uint64_t t2 = mbits(tick,63,63) ;
-          return t1 | t2;
-        case MISCREG_FPRS:
-          panic("FPU not implemented\n");
-        case MISCREG_PCR:
-        case MISCREG_PIC:
-          panic("Performance Instrumentation not impl\n");
+      case MISCREG_TICK:
+      case MISCREG_PRIVTICK:
+        // I'm not sure why legion ignores the lowest two bits, but we'll go
+        // with it
+        // change from curCycle() to instCount() until we're done with legion
+        DPRINTFN("Instruction Count when STICK read: %#X\n",
+                tc->getCpuPtr()->instCount());
+        return mbits(tc->getCpuPtr()->instCount() - (tick &
+                    mask(63)),62,2) | mbits(tick,63,63) ;
+      case MISCREG_FPRS:
+        panic("FPU not implemented\n");
+      case MISCREG_PCR:
+      case MISCREG_PIC:
+        panic("Performance Instrumentation not impl\n");
         /** Floating Point Status Register */
-        case MISCREG_FSR:
-          panic("Floating Point not implemented\n");
-//We'll include this only in FS so we don't need the SparcSystem type around
-//in SE.
-/*#if FULL_SYSTEM
-        case MISCREG_STICK:
-          SparcSystem *sys;
-          sys = dynamic_cast<SparcSystem*>(tc->getSystemPtr());
-          assert(sys != NULL);
-          return curTick/Clock::Int::ns - sys->sysTick | (stick & ~(mask(63)));
-#endif*/
-        case MISCREG_HVER:
-          return NWindows | MaxTL << 8 | MaxGL << 16;
+      case MISCREG_FSR:
+        panic("Floating Point not implemented\n");
+      case MISCREG_STICK:
+      case MISCREG_SOFTINT:
+      case MISCREG_SOFTINT_CLR:
+      case MISCREG_SOFTINT_SET:
+      case MISCREG_TICK_CMPR:
+      case MISCREG_STICK_CMPR:
+      case MISCREG_HPSTATE:
+      case MISCREG_HINTP:
+      case MISCREG_HTSTATE:
+      case MISCREG_HTBA:
+      case MISCREG_HVER:
+      case MISCREG_STRAND_STS_REG:
+      case MISCREG_HSTICK_CMPR:
+#if FULL_SYSTEM
+        return readFSRegWithEffect(miscReg, tc);
+#else
+        panic("Accessing Fullsystem register is SE mode\n");
+#endif
+
     }
     return readReg(miscReg);
 }
@@ -321,200 +322,200 @@ MiscReg MiscRegFile::readRegWithEffect(int miscReg, ThreadContext * tc)
 void MiscRegFile::setReg(int miscReg, const MiscReg &val)
 {
     switch (miscReg) {
-        case MISCREG_Y:
-          y = val;
-          break;
-        case MISCREG_CCR:
-          ccr = val;
-          break;
-        case MISCREG_ASI:
-          asi = val;
-          break;
-        case MISCREG_FPRS:
-          fprs = val;
-          break;
-        case MISCREG_TICK:
-          tick = val;
-          break;
-        case MISCREG_PCR:
-          panic("PCR not implemented\n");
-        case MISCREG_PIC:
-          panic("PIC not implemented\n");
-        case MISCREG_GSR:
-          gsr = val;
-          break;
-        case MISCREG_SOFTINT:
-          softint = val;
-          break;
-        case MISCREG_TICK_CMPR:
-          tick_cmpr = val;
-          break;
-        case MISCREG_STICK:
-          stick = val;
-          break;
-        case MISCREG_STICK_CMPR:
-          stick_cmpr = val;
-          break;
+      case MISCREG_Y:
+        y = val;
+        break;
+      case MISCREG_CCR:
+        ccr = val;
+        break;
+      case MISCREG_ASI:
+        asi = val;
+        break;
+      case MISCREG_FPRS:
+        fprs = val;
+        break;
+      case MISCREG_TICK:
+        tick = val;
+        break;
+      case MISCREG_PCR:
+        panic("PCR not implemented\n");
+      case MISCREG_PIC:
+        panic("PIC not implemented\n");
+      case MISCREG_GSR:
+        gsr = val;
+        break;
+      case MISCREG_SOFTINT:
+        softint = val;
+        break;
+      case MISCREG_TICK_CMPR:
+        tick_cmpr = val;
+        break;
+      case MISCREG_STICK:
+        stick = val;
+        break;
+      case MISCREG_STICK_CMPR:
+        stick_cmpr = val;
+        break;
 
         /** Privilged Registers */
-        case MISCREG_TPC:
-          tpc[tl-1] = val;
-          break;
-        case MISCREG_TNPC:
-          tnpc[tl-1] = val;
-          break;
-        case MISCREG_TSTATE:
-          tstate[tl-1] = val;
-          break;
-        case MISCREG_TT:
-          tt[tl-1] = val;
-          break;
-        case MISCREG_PRIVTICK:
-          panic("Priviliged access to tick regesiters not implemented\n");
-        case MISCREG_TBA:
-          // clear lower 7 bits on writes.
-          tba = val & ULL(~0x7FFF);
-          break;
-        case MISCREG_PSTATE:
-          pstate = (val & PSTATE_MASK);
-          break;
-        case MISCREG_TL:
-          tl = val;
-          break;
-        case MISCREG_PIL:
-          pil = val;
-          break;
-        case MISCREG_CWP:
-          cwp = val;
-          break;
-        case MISCREG_CANSAVE:
-          cansave = val;
-          break;
-        case MISCREG_CANRESTORE:
-          canrestore = val;
-          break;
-        case MISCREG_CLEANWIN:
-          cleanwin = val;
-          break;
-        case MISCREG_OTHERWIN:
-          otherwin = val;
-          break;
-        case MISCREG_WSTATE:
-          wstate = val;
-          break;
-        case MISCREG_GL:
-          gl = val;
-          break;
+      case MISCREG_TPC:
+        tpc[tl-1] = val;
+        break;
+      case MISCREG_TNPC:
+        tnpc[tl-1] = val;
+        break;
+      case MISCREG_TSTATE:
+        tstate[tl-1] = val;
+        break;
+      case MISCREG_TT:
+        tt[tl-1] = val;
+        break;
+      case MISCREG_PRIVTICK:
+        panic("Priviliged access to tick regesiters not implemented\n");
+      case MISCREG_TBA:
+        // clear lower 7 bits on writes.
+        tba = val & ULL(~0x7FFF);
+        break;
+      case MISCREG_PSTATE:
+        pstate = (val & PSTATE_MASK);
+        break;
+      case MISCREG_TL:
+        tl = val;
+        break;
+      case MISCREG_PIL:
+        pil = val;
+        break;
+      case MISCREG_CWP:
+        cwp = val;
+        break;
+      case MISCREG_CANSAVE:
+        cansave = val;
+        break;
+      case MISCREG_CANRESTORE:
+        canrestore = val;
+        break;
+      case MISCREG_CLEANWIN:
+        cleanwin = val;
+        break;
+      case MISCREG_OTHERWIN:
+        otherwin = val;
+        break;
+      case MISCREG_WSTATE:
+        wstate = val;
+        break;
+      case MISCREG_GL:
+        gl = val;
+        break;
 
         /** Hyper privileged registers */
-        case MISCREG_HPSTATE:
-          hpstate = val;
-          break;
-        case MISCREG_HTSTATE:
-          htstate[tl-1] = val;
-          break;
-        case MISCREG_HINTP:
-          panic("HINTP not implemented\n");
-        case MISCREG_HTBA:
-          htba = val;
-          break;
-        case MISCREG_STRAND_STS_REG:
-          strandStatusReg = val;
-          break;
-        case MISCREG_HSTICK_CMPR:
-          hstick_cmpr = val;
-          break;
+      case MISCREG_HPSTATE:
+        hpstate = val;
+        break;
+      case MISCREG_HTSTATE:
+        htstate[tl-1] = val;
+        break;
+      case MISCREG_HINTP:
+        panic("HINTP not implemented\n");
+      case MISCREG_HTBA:
+        htba = val;
+        break;
+      case MISCREG_STRAND_STS_REG:
+        strandStatusReg = val;
+        break;
+      case MISCREG_HSTICK_CMPR:
+        hstick_cmpr = val;
+        break;
 
         /** Floating Point Status Register */
-        case MISCREG_FSR:
-          fsr = val;
-          break;
-
-        case MISCREG_MMU_P_CONTEXT:
-          priContext = val;
-          break;
-        case MISCREG_MMU_S_CONTEXT:
-          secContext = val;
-          break;
-        case MISCREG_MMU_PART_ID:
-          partId = val;
-          break;
-        case MISCREG_MMU_LSU_CTRL:
-          lsuCtrlReg = val;
-          break;
-
-        case MISCREG_MMU_ITLB_C0_TSB_PS0:
-          iTlbC0TsbPs0 = val;
-          break;
-        case MISCREG_MMU_ITLB_C0_TSB_PS1:
-          iTlbC0TsbPs1 = val;
-          break;
-        case MISCREG_MMU_ITLB_C0_CONFIG:
-          iTlbC0Config = val;
-          break;
-        case MISCREG_MMU_ITLB_CX_TSB_PS0:
-          iTlbCXTsbPs0 = val;
-          break;
-        case MISCREG_MMU_ITLB_CX_TSB_PS1:
-          iTlbCXTsbPs1 = val;
-          break;
-        case MISCREG_MMU_ITLB_CX_CONFIG:
-          iTlbCXConfig = val;
-          break;
-        case MISCREG_MMU_ITLB_SFSR:
-          iTlbSfsr = val;
-          break;
-        case MISCREG_MMU_ITLB_TAG_ACCESS:
-          iTlbTagAccess = val;
-          break;
-
-        case MISCREG_MMU_DTLB_C0_TSB_PS0:
-          dTlbC0TsbPs0 = val;
-          break;
-        case MISCREG_MMU_DTLB_C0_TSB_PS1:
-          dTlbC0TsbPs1 = val;
-          break;
-        case MISCREG_MMU_DTLB_C0_CONFIG:
-          dTlbC0Config = val;
-          break;
-        case MISCREG_MMU_DTLB_CX_TSB_PS0:
-          dTlbCXTsbPs0 = val;
-          break;
-        case MISCREG_MMU_DTLB_CX_TSB_PS1:
-          dTlbCXTsbPs1 = val;
-          break;
-        case MISCREG_MMU_DTLB_CX_CONFIG:
-          dTlbCXConfig = val;
-          break;
-        case MISCREG_MMU_DTLB_SFSR:
-          dTlbSfsr = val;
-          break;
-        case MISCREG_MMU_DTLB_SFAR:
-          dTlbSfar = val;
-          break;
-        case MISCREG_MMU_DTLB_TAG_ACCESS:
-          dTlbTagAccess = val;
-          break;
-
-        case MISCREG_SCRATCHPAD_R0:
-           scratchPad[0] = val;
-        case MISCREG_SCRATCHPAD_R1:
-           scratchPad[1] = val;
-        case MISCREG_SCRATCHPAD_R2:
-           scratchPad[2] = val;
-        case MISCREG_SCRATCHPAD_R3:
-           scratchPad[3] = val;
-        case MISCREG_SCRATCHPAD_R4:
-           scratchPad[4] = val;
-        case MISCREG_SCRATCHPAD_R5:
-           scratchPad[5] = val;
-        case MISCREG_SCRATCHPAD_R6:
-           scratchPad[6] = val;
-        case MISCREG_SCRATCHPAD_R7:
-           scratchPad[7] = val;
-
-        default:
-          panic("Miscellaneous register %d not implemented\n", miscReg);
+      case MISCREG_FSR:
+        fsr = val;
+        break;
+
+      case MISCREG_MMU_P_CONTEXT:
+        priContext = val;
+        break;
+      case MISCREG_MMU_S_CONTEXT:
+        secContext = val;
+        break;
+      case MISCREG_MMU_PART_ID:
+        partId = val;
+        break;
+      case MISCREG_MMU_LSU_CTRL:
+        lsuCtrlReg = val;
+        break;
+
+      case MISCREG_MMU_ITLB_C0_TSB_PS0:
+        iTlbC0TsbPs0 = val;
+        break;
+      case MISCREG_MMU_ITLB_C0_TSB_PS1:
+        iTlbC0TsbPs1 = val;
+        break;
+      case MISCREG_MMU_ITLB_C0_CONFIG:
+        iTlbC0Config = val;
+        break;
+      case MISCREG_MMU_ITLB_CX_TSB_PS0:
+        iTlbCXTsbPs0 = val;
+        break;
+      case MISCREG_MMU_ITLB_CX_TSB_PS1:
+        iTlbCXTsbPs1 = val;
+        break;
+      case MISCREG_MMU_ITLB_CX_CONFIG:
+        iTlbCXConfig = val;
+        break;
+      case MISCREG_MMU_ITLB_SFSR:
+        iTlbSfsr = val;
+        break;
+      case MISCREG_MMU_ITLB_TAG_ACCESS:
+        iTlbTagAccess = val;
+        break;
+
+      case MISCREG_MMU_DTLB_C0_TSB_PS0:
+        dTlbC0TsbPs0 = val;
+        break;
+      case MISCREG_MMU_DTLB_C0_TSB_PS1:
+        dTlbC0TsbPs1 = val;
+        break;
+      case MISCREG_MMU_DTLB_C0_CONFIG:
+        dTlbC0Config = val;
+        break;
+      case MISCREG_MMU_DTLB_CX_TSB_PS0:
+        dTlbCXTsbPs0 = val;
+        break;
+      case MISCREG_MMU_DTLB_CX_TSB_PS1:
+        dTlbCXTsbPs1 = val;
+        break;
+      case MISCREG_MMU_DTLB_CX_CONFIG:
+        dTlbCXConfig = val;
+        break;
+      case MISCREG_MMU_DTLB_SFSR:
+        dTlbSfsr = val;
+        break;
+      case MISCREG_MMU_DTLB_SFAR:
+        dTlbSfar = val;
+        break;
+      case MISCREG_MMU_DTLB_TAG_ACCESS:
+        dTlbTagAccess = val;
+        break;
+
+      case MISCREG_SCRATCHPAD_R0:
+        scratchPad[0] = val;
+      case MISCREG_SCRATCHPAD_R1:
+        scratchPad[1] = val;
+      case MISCREG_SCRATCHPAD_R2:
+        scratchPad[2] = val;
+      case MISCREG_SCRATCHPAD_R3:
+        scratchPad[3] = val;
+      case MISCREG_SCRATCHPAD_R4:
+        scratchPad[4] = val;
+      case MISCREG_SCRATCHPAD_R5:
+        scratchPad[5] = val;
+      case MISCREG_SCRATCHPAD_R6:
+        scratchPad[6] = val;
+      case MISCREG_SCRATCHPAD_R7:
+        scratchPad[7] = val;
+
+      default:
+        panic("Miscellaneous register %d not implemented\n", miscReg);
     }
 }
 
@@ -522,100 +523,47 @@ void MiscRegFile::setRegWithEffect(int miscReg,
         const MiscReg &val, ThreadContext * tc)
 {
     const uint64_t Bit64 = (1ULL << 63);
-#if FULL_SYSTEM
-    uint64_t time;
-    SparcSystem *sys;
-#endif
     switch (miscReg) {
-        case MISCREG_STICK:
-        case MISCREG_TICK:
-          // change from curCycle() to instCount() until we're done with legion
-          tick = tc->getCpuPtr()->instCount() - val  & ~Bit64;
-          tick |= val & Bit64;
-          break;
-        case MISCREG_FPRS:
-          //Configure the fpu based on the fprs
-          break;
-        case MISCREG_PCR:
-          //Set up performance counting based on pcr value
-          break;
-        case MISCREG_PSTATE:
-          pstate = val & PSTATE_MASK;
-          return;
-        case MISCREG_TL:
-          tl = val;
-          return;
-        case MISCREG_CWP:
-          tc->changeRegFileContext(CONTEXT_CWP, val);
-          break;
-        case MISCREG_GL:
-          tc->changeRegFileContext(CONTEXT_GLOBALS, val);
-          break;
-        case MISCREG_SOFTINT:
-          //We need to inject interrupts, and or notify the interrupt
-          //object that it needs to use a different interrupt level.
-          //Any newly appropriate interrupts will happen when the cpu gets
-          //around to checking for them. This might not be quite what we
-          //want.
-          break;
-        case MISCREG_SOFTINT_CLR:
-          //Do whatever this is supposed to do...
-          break;
-        case MISCREG_SOFTINT_SET:
-          //Do whatever this is supposed to do...
-          break;
-#if FULL_SYSTEM
-        case MISCREG_TICK_CMPR:
-          if (tickCompare == NULL)
-              tickCompare = new TickCompareEvent(this, tc);
-          setReg(miscReg, val);
-          if ((tick_cmpr & mask(63)) && tickCompare->scheduled())
-                  tickCompare->deschedule();
-          time = (tick_cmpr & mask(63)) - (tick & mask(63));
-          if (!(tick_cmpr & ~mask(63)) && time > 0)
-              tickCompare->schedule(time * tc->getCpuPtr()->cycles(1));
-          break;
-#endif
-        case MISCREG_PIL:
-          //We need to inject interrupts, and or notify the interrupt
-          //object that it needs to use a different interrupt level.
-          //Any newly appropriate interrupts will happen when the cpu gets
-          //around to checking for them. This might not be quite what we
-          //want.
-          break;
-//We'll include this only in FS so we don't need the SparcSystem type around
-//in SE.
+      case MISCREG_STICK:
+      case MISCREG_TICK:
+        // change from curCycle() to instCount() until we're done with legion
+        tick = tc->getCpuPtr()->instCount() - val  & ~Bit64;
+        tick |= val & Bit64;
+        break;
+      case MISCREG_FPRS:
+        //Configure the fpu based on the fprs
+        break;
+      case MISCREG_PCR:
+        //Set up performance counting based on pcr value
+        break;
+      case MISCREG_PSTATE:
+        pstate = val & PSTATE_MASK;
+        return;
+      case MISCREG_TL:
+        tl = val;
+        return;
+      case MISCREG_CWP:
+        tc->changeRegFileContext(CONTEXT_CWP, val);
+        break;
+      case MISCREG_GL:
+        tc->changeRegFileContext(CONTEXT_GLOBALS, val);
+        break;
+      case MISCREG_PIL:
+      case MISCREG_SOFTINT:
+      case MISCREG_TICK_CMPR:
+      case MISCREG_STICK_CMPR:
+      case MISCREG_HPSTATE:
+      case MISCREG_HINTP:
+      case MISCREG_HTSTATE:
+      case MISCREG_HTBA:
+      case MISCREG_HVER:
+      case MISCREG_STRAND_STS_REG:
+      case MISCREG_HSTICK_CMPR:
 #if FULL_SYSTEM
-        // @todo figure out how we're actualy going to do this. In niagra the
-        // registers are aliased to the same thing (see tick above)
-        /*case MISCREG_STICK:
-          sys = dynamic_cast<SparcSystem*>(tc->getSystemPtr());
-          assert(sys != NULL);
-          sys->sysTick = curTick/Clock::Int::ns - val & ~Bit64;
-          stick |= val & Bit64;
-          break;*/
-        case MISCREG_STICK_CMPR:
-          if (sTickCompare == NULL)
-              sTickCompare = new STickCompareEvent(this, tc);
-          sys = dynamic_cast<SparcSystem*>(tc->getSystemPtr());
-          assert(sys != NULL);
-          if ((stick_cmpr & ~mask(63)) && sTickCompare->scheduled())
-                  sTickCompare->deschedule();
-          time = (stick_cmpr & mask(63)) - sys->sysTick;
-          if (!(stick_cmpr & ~mask(63)) && time > 0)
-              sTickCompare->schedule(time * Clock::Int::ns);
-          break;
-        case MISCREG_HSTICK_CMPR:
-          if (hSTickCompare == NULL)
-              hSTickCompare = new HSTickCompareEvent(this, tc);
-          sys = dynamic_cast<SparcSystem*>(tc->getSystemPtr());
-          assert(sys != NULL);
-          if ((hstick_cmpr & ~mask(63)) && hSTickCompare->scheduled())
-                  hSTickCompare->deschedule();
-          int64_t time = (hstick_cmpr & mask(63)) - sys->sysTick;
-          if (!(hstick_cmpr & ~mask(63)) && time > 0)
-              hSTickCompare->schedule(time * Clock::Int::ns);
-          break;
+        setFSRegWithEffect(miscReg, val, tc);
+        return;
+#else
+        panic("Accessing Fullsystem register is SE mode\n");
 #endif
     }
     setReg(miscReg, val);
@@ -720,24 +668,5 @@ void MiscRegFile::unserialize(Checkpoint * cp, const std::string & section)
     UNSERIALIZE_SCALAR(dTlbSfsr);
     UNSERIALIZE_SCALAR(dTlbSfar);
     UNSERIALIZE_SCALAR(dTlbTagAccess);
-    UNSERIALIZE_ARRAY(scratchPad,8);}
-
-#if FULL_SYSTEM
-void
-MiscRegFile::processTickCompare(ThreadContext *tc)
-{
-    panic("tick compare not implemented\n");
-}
-
-void
-MiscRegFile::processSTickCompare(ThreadContext *tc)
-{
-    panic("tick compare not implemented\n");
+    UNSERIALIZE_ARRAY(scratchPad,8);
 }
-
-void
-MiscRegFile::processHSTickCompare(ThreadContext *tc)
-{
-    panic("tick compare not implemented\n");
-}
-#endif