86,89c86,87
< ArmISA::PCState pc = PCS;
< pc.nextThumb(((CPSR)newCpsr).t);
< pc.nextJazelle(((CPSR)newCpsr).j);
< PCS = pc;
---
> NextThumb = ((CPSR)newCpsr).t;
> NextJazelle = ((CPSR)newCpsr).j;
114,117c112,113
< ArmISA::PCState pc = PCS;
< pc.nextThumb(((CPSR)newCpsr).t);
< pc.nextJazelle(((CPSR)newCpsr).j);
< PCS = pc;
---
> NextThumb = ((CPSR)newCpsr).t;
> NextJazelle = ((CPSR)newCpsr).j;
473,476c469
< bkptCode = '''
< ArmISA::PCState pc = PCS;
< return new PrefetchAbort(pc.pc(), ArmFault::DebugEvent);
< '''
---
> bkptCode = 'return new PrefetchAbort(PC, ArmFault::DebugEvent);\n'
653,656c646,647
< ArmISA::PCState pc = PCS;
< pc.nextThumb(true);
< pc.nextJazelle(true);
< PCS = pc;
---
> NextThumb = true;
> NextJazelle = true;
666,669c657,658
< ArmISA::PCState pc = PCS;
< pc.nextThumb(true);
< pc.nextJazelle(false);
< PCS = pc;
---
> NextThumb = true;
> NextJazelle = false;