1 files changed, 31 insertions, 13 deletions

diff --git a/src/arch/mips/isa/decoder.isa b/src/arch/mips/isa/decoder.isa
index 9832937b5..3f3bd370a 100644
--- a/src/arch/mips/isa/decoder.isa
+++ b/src/arch/mips/isa/decoder.isa
@@ -133,25 +133,34 @@ decode OPCODE_HI default Unknown::unknown() {
                         0x1: jr_hb({{
                             Config1Reg config1 = Config1;
                             if (config1.ca == 0) {
-                                NNPC = Rs;
+                                pc.nnpc(Rs);
                             } else {
                                 panic("MIPS16e not supported\n");
                             }
+                            PCS = pc;
                         }}, IsReturn, ClearHazards);
                         default: jr({{
                             Config1Reg config1 = Config1;
                             if (config1.ca == 0) {
-                                NNPC = Rs;
+                                pc.nnpc(Rs);
                             } else {
                                 panic("MIPS16e not supported\n");
                             }
+                            PCS = pc;
                         }}, IsReturn);
                     }
 
                     0x1: decode HINT {
-                        0x1: jalr_hb({{ Rd = NNPC; NNPC = Rs; }}, IsCall
-                                     , ClearHazards);
-                        default: jalr({{ Rd = NNPC; NNPC = Rs; }}, IsCall);
+                        0x1: jalr_hb({{
+                            Rd = pc.nnpc();
+                            pc.nnpc(Rs);
+                            PCS = pc;
+                        }}, IsCall, ClearHazards);
+                        default: jalr({{
+                            Rd = pc.nnpc();
+                            pc.nnpc(Rs);
+                            PCS = pc;
+                        }}, IsCall);
                     }
                 }
 
@@ -323,9 +332,14 @@ decode OPCODE_HI default Unknown::unknown() {
         }
 
         format Jump {
-            0x2: j({{ NNPC = (NPC & 0xF0000000) | (JMPTARG << 2); }});
-            0x3: jal({{ NNPC = (NPC & 0xF0000000) | (JMPTARG << 2); }},
-                    IsCall, Link);
+            0x2: j({{
+                pc.nnpc((pc.npc() & 0xF0000000) | (JMPTARG << 2));
+                PCS = pc;
+            }});
+            0x3: jal({{
+                pc.nnpc((pc.npc() & 0xF0000000) | (JMPTARG << 2));
+                PCS = pc;
+            }}, IsCall, Link);
         }
 
         format Branch {
@@ -694,15 +708,16 @@ decode OPCODE_HI default Unknown::unknown() {
                         ConfigReg config = Config;
                         SRSCtlReg srsCtl = SRSCtl;
                         DPRINTF(MipsPRA,"Restoring PC - %x\n",EPC);
+                        MipsISA::PCState pc = PCS;
                         if (status.erl == 1) {
                             status.erl = 0;
-                            NPC = ErrorEPC;
+                            pc.npc(ErrorEPC);
                             // Need to adjust NNPC, otherwise things break
-                            NNPC = ErrorEPC + sizeof(MachInst);
+                            pc.nnpc(ErrorEPC + sizeof(MachInst));
                         } else {
-                            NPC = EPC;
+                            pc.npc(EPC);
                             // Need to adjust NNPC, otherwise things break
-                            NNPC = EPC + sizeof(MachInst);
+                            pc.nnpc(EPC + sizeof(MachInst));
                             status.exl = 0;
                             if (config.ar >=1 &&
                                     srsCtl.hss > 0 &&
@@ -711,6 +726,7 @@ decode OPCODE_HI default Unknown::unknown() {
                                 //xc->setShadowSet(srsCtl.pss);
                             }
                         }
+                        PCS = pc;
                         LLFlag = 0;
                         Status = status;
                         SRSCtl = srsCtl;
@@ -718,13 +734,15 @@ decode OPCODE_HI default Unknown::unknown() {
 
                     0x1F: deret({{
                         DebugReg debug = Debug;
+                        MipsISA::PCState pc = PCS;
                         if (debug.dm == 1) {
                             debug.dm = 1;
                             debug.iexi = 0;
-                            NPC = DEPC;
+                            pc.npc(DEPC);
                         } else {
                             // Undefined;
                         }
+                        PCS = pc;
                         Debug = debug;
                     }}, IsReturn, IsSerializing, IsERET);
                 }