1 files changed, 21 insertions, 3 deletions

diff --git a/src/arch/arm/isa/insts/misc.isa b/src/arch/arm/isa/insts/misc.isa
index 5742f84ab..1abbc3de1 100644
--- a/src/arch/arm/isa/insts/misc.isa
+++ b/src/arch/arm/isa/insts/misc.isa
@@ -83,6 +83,10 @@ let {{
         uint32_t newCpsr =
             cpsrWriteByInstr(Cpsr | CondCodes, Op1, byteMask, false, sctlr.nmfi);
         Cpsr = ~CondCodesMask & newCpsr;
+        ArmISA::PCState pc = PCS;
+        pc.nextThumb(((CPSR)newCpsr).t);
+        pc.nextJazelle(((CPSR)newCpsr).j);
+        PCS = pc;
         CondCodes = CondCodesMask & newCpsr;
     '''
     msrCpsrRegIop = InstObjParams("msr", "MsrCpsrReg", "MsrRegOp",
@@ -107,6 +111,10 @@ let {{
         uint32_t newCpsr =
             cpsrWriteByInstr(Cpsr | CondCodes, imm, byteMask, false, sctlr.nmfi);
         Cpsr = ~CondCodesMask & newCpsr;
+        ArmISA::PCState pc = PCS;
+        pc.nextThumb(((CPSR)newCpsr).t);
+        pc.nextJazelle(((CPSR)newCpsr).j);
+        PCS = pc;
         CondCodes = CondCodesMask & newCpsr;
     '''
     msrCpsrImmIop = InstObjParams("msr", "MsrCpsrImm", "MsrImmOp",
@@ -462,8 +470,12 @@ let {{
     decoder_output += RegRegRegRegOpConstructor.subst(usada8Iop)
     exec_output += PredOpExecute.subst(usada8Iop)
 
+    bkptCode = '''
+    ArmISA::PCState pc = PCS;
+    return new PrefetchAbort(pc.pc(), ArmFault::DebugEvent);
+    '''
     bkptIop = InstObjParams("bkpt", "BkptInst", "ArmStaticInst",
-            "return new PrefetchAbort(PC, ArmFault::DebugEvent);")
+            bkptCode)
     header_output += BasicDeclare.subst(bkptIop)
     decoder_output += BasicConstructor.subst(bkptIop)
     exec_output += BasicExecute.subst(bkptIop)
@@ -638,7 +650,10 @@ let {{
     exec_output += PredOpExecute.subst(mcr15UserIop)
 
     enterxCode = '''
-        FNPC = NPC | PcJBit | PcTBit;
+        ArmISA::PCState pc = PCS;
+        pc.nextThumb(true);
+        pc.nextJazelle(true);
+        PCS = pc;
     '''
     enterxIop = InstObjParams("enterx", "Enterx", "PredOp",
                               { "code": enterxCode,
@@ -648,7 +663,10 @@ let {{
     exec_output += PredOpExecute.subst(enterxIop)
 
     leavexCode = '''
-        FNPC = (NPC & ~PcJBit) | PcTBit;
+        ArmISA::PCState pc = PCS;
+        pc.nextThumb(true);
+        pc.nextJazelle(false);
+        PCS = pc;
     '''
     leavexIop = InstObjParams("leavex", "Leavex", "PredOp",
                               { "code": leavexCode,