923,924c923,925
< bool hypTrap = mcrMrc15TrapToHyp(miscReg, Hcr, Cpsr, Scr, Hdcr, Hstr,
< Hcptr, imm);
---
>
> bool hypTrap = mcrMrc15TrapToHyp(miscReg, xc->tcBase(), imm);
>
955,956c956,958
< bool hypTrap = mcrMrc15TrapToHyp(miscReg, Hcr, Cpsr, Scr, Hdcr, Hstr,
< Hcptr, imm);
---
>
> bool hypTrap = mcrMrc15TrapToHyp(miscReg, xc->tcBase(), imm);
>
1095,1096c1097,1099
< bool hypTrap = mcrMrc15TrapToHyp(miscReg, Hcr, Cpsr, Scr, Hdcr, Hstr,
< Hcptr, imm);
---
>
> bool hypTrap = mcrMrc15TrapToHyp(miscReg, xc->tcBase(), imm);
>
1193,1194c1196,1197
< if ((imm != 0) && mcrMrc15TrapToHyp(MISCREG_CP15ISB, Hcr, Cpsr, Scr,
< Hdcr, Hstr, Hcptr, imm)) {
---
> if ((imm != 0) && mcrMrc15TrapToHyp(MISCREG_CP15ISB,
> xc->tcBase(), imm)) {
1209,1210c1212,1213
< if ((imm != 0) && mcrMrc15TrapToHyp(MISCREG_CP15DSB, Hcr, Cpsr, Scr,
< Hdcr, Hstr, Hcptr, imm)) {
---
> if ((imm != 0) && mcrMrc15TrapToHyp(MISCREG_CP15DSB,
> xc->tcBase(), imm)) {
1225,1226c1228,1229
< if ((imm != 0) && mcrMrc15TrapToHyp(MISCREG_CP15DMB, Hcr, Cpsr, Scr,
< Hdcr, Hstr, Hcptr, imm)) {
---
> if ((imm != 0) && mcrMrc15TrapToHyp(MISCREG_CP15DMB,
> xc->tcBase(), imm)) {