361c361,362
< for (int i = 0; i < TheISA::NumIntArchRegs; i++) {
---
> // assume we have %g0 working correctly
> for (int i = 1; i < TheISA::NumIntArchRegs; i++) {
431c432
< thread->readMiscReg(NumIntArchRegs + 4))
---
> thread->readIntReg(NumIntArchRegs + 4))
435c436
< thread->readIntReg(NumIntArchRegs + 5))
---
> thread->readIntReg(NumIntArchRegs + 6))
439c440
< thread->readMiscReg(NumIntArchRegs + 6))
---
> thread->readIntReg(NumIntArchRegs + 5))
556c557
< thread->readMiscReg(NumIntArchRegs + 1),
---
> thread->readIntReg(NumIntArchRegs + 1),
560c561
< thread->readMiscReg(NumIntArchRegs + 2),
---
> thread->readIntReg(NumIntArchRegs + 2),
587c588
< thread->readIntReg(NumIntArchRegs + 5),
---
> thread->readIntReg(NumIntArchRegs + 6),
591c592
< thread->readIntReg(NumIntArchRegs + 6),
---
> thread->readIntReg(NumIntArchRegs + 5),