108c108,109
< NPC = cSwap<uint32_t>(Mem.ud, cpsr.e);
---
> ArmISA::PCState pc = PCS;
> pc.instNPC(cSwap<uint32_t>(Mem.ud, cpsr.e));
113a115,117
> pc.nextThumb(((CPSR)newCpsr).t);
> pc.nextJazelle(((CPSR)newCpsr).j);
> PCS = pc;