242,245c242,243
< ArmISA::PCState pc = PCS;
< pc.nextThumb(((CPSR)newCpsr).t);
< pc.nextJazelle(((CPSR)newCpsr).j);
< PCS = pc;
---
> NextThumb = ((CPSR)newCpsr).t;
> NextJazelle = ((CPSR)newCpsr).j;
260,261c258
< ArmISA::PCState pc = PCS;
< Dest = resTemp = (pc.instPC() & ~0x3) +
---
> Dest = resTemp = (PC & ~0x3) +