305,306c305,306
< MiscReg TL = tc->readMiscRegNoEffect(MISCREG_TL);
< MiscReg TSTATE = tc->readMiscRegNoEffect(MISCREG_TSTATE);
---
> RegVal TL = tc->readMiscRegNoEffect(MISCREG_TL);
> RegVal TSTATE = tc->readMiscRegNoEffect(MISCREG_TSTATE);
309,313c309,313
< MiscReg CCR = tc->readIntReg(NumIntArchRegs + 2);
< MiscReg ASI = tc->readMiscRegNoEffect(MISCREG_ASI);
< MiscReg CWP = tc->readMiscRegNoEffect(MISCREG_CWP);
< MiscReg CANSAVE = tc->readMiscRegNoEffect(NumIntArchRegs + 3);
< MiscReg GL = tc->readMiscRegNoEffect(MISCREG_GL);
---
> RegVal CCR = tc->readIntReg(NumIntArchRegs + 2);
> RegVal ASI = tc->readMiscRegNoEffect(MISCREG_ASI);
> RegVal CWP = tc->readMiscRegNoEffect(MISCREG_CWP);
> RegVal CANSAVE = tc->readMiscRegNoEffect(NumIntArchRegs + 3);
> RegVal GL = tc->readMiscRegNoEffect(MISCREG_GL);
384,385c384,385
< MiscReg TL = tc->readMiscRegNoEffect(MISCREG_TL);
< MiscReg TSTATE = tc->readMiscRegNoEffect(MISCREG_TSTATE);
---
> RegVal TL = tc->readMiscRegNoEffect(MISCREG_TL);
> RegVal TSTATE = tc->readMiscRegNoEffect(MISCREG_TSTATE);
388,392c388,392
< MiscReg CCR = tc->readIntReg(NumIntArchRegs + 2);
< MiscReg ASI = tc->readMiscRegNoEffect(MISCREG_ASI);
< MiscReg CWP = tc->readMiscRegNoEffect(MISCREG_CWP);
< MiscReg CANSAVE = tc->readIntReg(NumIntArchRegs + 3);
< MiscReg GL = tc->readMiscRegNoEffect(MISCREG_GL);
---
> RegVal CCR = tc->readIntReg(NumIntArchRegs + 2);
> RegVal ASI = tc->readMiscRegNoEffect(MISCREG_ASI);
> RegVal CWP = tc->readMiscRegNoEffect(MISCREG_CWP);
> RegVal CANSAVE = tc->readIntReg(NumIntArchRegs + 3);
> RegVal GL = tc->readMiscRegNoEffect(MISCREG_GL);
473c473
< getREDVector(MiscReg TT, Addr &PC, Addr &NPC)
---
> getREDVector(RegVal TT, Addr &PC, Addr &NPC)
482c482
< getHyperVector(ThreadContext * tc, Addr &PC, Addr &NPC, MiscReg TT)
---
> getHyperVector(ThreadContext * tc, Addr &PC, Addr &NPC, RegVal TT)
490c490
< getPrivVector(ThreadContext *tc, Addr &PC, Addr &NPC, MiscReg TT, MiscReg TL)
---
> getPrivVector(ThreadContext *tc, Addr &PC, Addr &NPC, RegVal TT, RegVal TL)
510,511c510,511
< MiscReg tl = tc->readMiscRegNoEffect(MISCREG_TL);
< MiscReg tt = tc->readMiscRegNoEffect(MISCREG_TT);
---
> RegVal tl = tc->readMiscRegNoEffect(MISCREG_TL);
> RegVal tt = tc->readMiscRegNoEffect(MISCREG_TT);
734c734
< MiscReg reg_asi = tc->readMiscRegNoEffect(MISCREG_ASI);
---
> RegVal reg_asi = tc->readMiscRegNoEffect(MISCREG_ASI);