diff options
Diffstat (limited to 'src/arch/sparc/process.cc')
-rw-r--r-- | src/arch/sparc/process.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc index 7dda6ed21..6659a04fa 100644 --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -183,7 +183,7 @@ Sparc64Process::initState() pstate.ie = 1; tc->setMiscReg(MISCREG_PSTATE, pstate); - argsInit(sizeof(IntReg), PageBytes); + argsInit(sizeof(RegVal), PageBytes); } template<class IntType> @@ -441,11 +441,11 @@ Sparc32Process::argsInit(int intSize, int pageSize) void Sparc32Process::flushWindows(ThreadContext *tc) { - IntReg Cansave = tc->readIntReg(NumIntArchRegs + 3); - IntReg Canrestore = tc->readIntReg(NumIntArchRegs + 4); - IntReg Otherwin = tc->readIntReg(NumIntArchRegs + 6); - MiscReg CWP = tc->readMiscReg(MISCREG_CWP); - MiscReg origCWP = CWP; + RegVal Cansave = tc->readIntReg(NumIntArchRegs + 3); + RegVal Canrestore = tc->readIntReg(NumIntArchRegs + 4); + RegVal Otherwin = tc->readIntReg(NumIntArchRegs + 6); + RegVal CWP = tc->readMiscReg(MISCREG_CWP); + RegVal origCWP = CWP; CWP = (CWP + Cansave + 2) % NWindows; while (NWindows - 2 - Cansave != 0) { if (Otherwin) { @@ -453,7 +453,7 @@ void Sparc32Process::flushWindows(ThreadContext *tc) } else { tc->setMiscReg(MISCREG_CWP, CWP); // Do the stores - IntReg sp = tc->readIntReg(StackPointerReg); + RegVal sp = tc->readIntReg(StackPointerReg); for (int index = 16; index < 32; index++) { uint32_t regVal = tc->readIntReg(index); regVal = htog(regVal); @@ -476,11 +476,11 @@ void Sparc32Process::flushWindows(ThreadContext *tc) void Sparc64Process::flushWindows(ThreadContext *tc) { - IntReg Cansave = tc->readIntReg(NumIntArchRegs + 3); - IntReg Canrestore = tc->readIntReg(NumIntArchRegs + 4); - IntReg Otherwin = tc->readIntReg(NumIntArchRegs + 6); - MiscReg CWP = tc->readMiscReg(MISCREG_CWP); - MiscReg origCWP = CWP; + RegVal Cansave = tc->readIntReg(NumIntArchRegs + 3); + RegVal Canrestore = tc->readIntReg(NumIntArchRegs + 4); + RegVal Otherwin = tc->readIntReg(NumIntArchRegs + 6); + RegVal CWP = tc->readMiscReg(MISCREG_CWP); + RegVal origCWP = CWP; CWP = (CWP + Cansave + 2) % NWindows; while (NWindows - 2 - Cansave != 0) { if (Otherwin) { @@ -488,9 +488,9 @@ Sparc64Process::flushWindows(ThreadContext *tc) } else { tc->setMiscReg(MISCREG_CWP, CWP); // Do the stores - IntReg sp = tc->readIntReg(StackPointerReg); + RegVal sp = tc->readIntReg(StackPointerReg); for (int index = 16; index < 32; index++) { - IntReg regVal = tc->readIntReg(index); + RegVal regVal = tc->readIntReg(index); regVal = htog(regVal); if (!tc->getMemProxy().tryWriteBlob( sp + 2047 + (index - 16) * 8, (uint8_t *)®Val, 8)) { @@ -508,7 +508,7 @@ Sparc64Process::flushWindows(ThreadContext *tc) tc->setMiscReg(MISCREG_CWP, origCWP); } -IntReg +RegVal Sparc32Process::getSyscallArg(ThreadContext *tc, int &i) { assert(i < 6); @@ -516,13 +516,13 @@ Sparc32Process::getSyscallArg(ThreadContext *tc, int &i) } void -Sparc32Process::setSyscallArg(ThreadContext *tc, int i, IntReg val) +Sparc32Process::setSyscallArg(ThreadContext *tc, int i, RegVal val) { assert(i < 6); tc->setIntReg(FirstArgumentReg + i, bits(val, 31, 0)); } -IntReg +RegVal Sparc64Process::getSyscallArg(ThreadContext *tc, int &i) { assert(i < 6); @@ -530,7 +530,7 @@ Sparc64Process::getSyscallArg(ThreadContext *tc, int &i) } void -Sparc64Process::setSyscallArg(ThreadContext *tc, int i, IntReg val) +Sparc64Process::setSyscallArg(ThreadContext *tc, int i, RegVal val) { assert(i < 6); tc->setIntReg(FirstArgumentReg + i, val); @@ -547,7 +547,7 @@ SparcProcess::setSyscallReturn(ThreadContext *tc, SyscallReturn sysret) // no error, clear XCC.C tc->setIntReg(NumIntArchRegs + 2, tc->readIntReg(NumIntArchRegs + 2) & 0xEE); - IntReg val = sysret.returnValue(); + RegVal val = sysret.returnValue(); if (pstate.am) val = bits(val, 31, 0); tc->setIntReg(ReturnValueReg, val); @@ -555,7 +555,7 @@ SparcProcess::setSyscallReturn(ThreadContext *tc, SyscallReturn sysret) // got an error, set XCC.C tc->setIntReg(NumIntArchRegs + 2, tc->readIntReg(NumIntArchRegs + 2) | 0x11); - IntReg val = sysret.errnoValue(); + RegVal val = sysret.errnoValue(); if (pstate.am) val = bits(val, 31, 0); tc->setIntReg(ReturnValueReg, val); |