464,465c464
< mcrMrc15TrapToHyp(const MiscRegIndex miscReg, HCR hcr, CPSR cpsr, SCR scr,
< HDCR hdcr, HSTR hstr, HCPTR hcptr, uint32_t iss)
---
> mcrMrc15TrapToHyp(const MiscRegIndex miscReg, ThreadContext *tc, uint32_t iss)
474a474,479
> const CPSR cpsr = tc->readMiscReg(MISCREG_CPSR);
> const HCR hcr = tc->readMiscReg(MISCREG_HCR);
> const SCR scr = tc->readMiscReg(MISCREG_SCR);
> const HDCR hdcr = tc->readMiscReg(MISCREG_HDCR);
> const HSTR hstr = tc->readMiscReg(MISCREG_HSTR);
> const HCPTR hcptr = tc->readMiscReg(MISCREG_HCPTR);