136c136
< pc.nnpc(Rs);
---
> NNPC = Rs;
140d139
< PCS = pc;
145c144
< pc.nnpc(Rs);
---
> NNPC = Rs;
149d147
< PCS = pc;
155,157c153,154
< Rd = pc.nnpc();
< pc.nnpc(Rs);
< PCS = pc;
---
> Rd = NNPC;
> NNPC = Rs;
160,162c157,158
< Rd = pc.nnpc();
< pc.nnpc(Rs);
< PCS = pc;
---
> Rd = NNPC;
> NNPC = Rs;
335,342c331,333
< 0x2: j({{
< pc.nnpc((pc.npc() & 0xF0000000) | (JMPTARG << 2));
< PCS = pc;
< }});
< 0x3: jal({{
< pc.nnpc((pc.npc() & 0xF0000000) | (JMPTARG << 2));
< PCS = pc;
< }}, IsCall, Link);
---
> 0x2: j({{ NNPC = (NPC & 0xF0000000) | (JMPTARG << 2); }});
> 0x3: jal({{ NNPC = (NPC & 0xF0000000) | (JMPTARG << 2); }},
> IsCall, Link);
711d701
< MipsISA::PCState pc = PCS;
714c704
< pc.npc(ErrorEPC);
---
> NPC = ErrorEPC;
716c706
< pc.nnpc(ErrorEPC + sizeof(MachInst));
---
> NNPC = ErrorEPC + sizeof(MachInst);
718c708
< pc.npc(EPC);
---
> NPC = EPC;
720c710
< pc.nnpc(EPC + sizeof(MachInst));
---
> NNPC = EPC + sizeof(MachInst);
729d718
< PCS = pc;
737d725
< MipsISA::PCState pc = PCS;
741c729
< pc.npc(DEPC);
---
> NPC = DEPC;
742a731
> NPC = NPC;
745d733
< PCS = pc;