49,50c49,52
< NPC = xc->readPC() + disp;
< NNPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.npc(pc.pc() + disp);
> pc.nnpc(pc.npc() + 4);
> PCS = pc;
55,56c57,60
< NNPC = NPC + 8;
< NPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.nnpc(pc.npc() + 8);
> pc.npc(pc.npc() + 4);
> PCS = pc;
69,70c73,76
< NPC = xc->readPC() + disp;
< NNPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.npc(pc.pc() + disp);
> pc.nnpc(pc.npc() + 4);
> PCS = pc;
75,76c81,84
< NNPC = NPC + 8;
< NPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.nnpc(pc.npc() + 8);
> pc.npc(pc.npc() + 4);
> PCS = pc;
100,101c108,111
< NPC = xc->readPC() + disp;
< NNPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.npc(pc.pc() + disp);
> pc.nnpc(pc.npc() + 4);
> PCS = pc;
106,107c116,119
< NNPC = NPC + 8;
< NPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.nnpc(pc.npc() + 8);
> pc.npc(pc.npc() + 4);
> PCS = pc;
126,127c138,141
< NPC = xc->readPC() + disp;
< NNPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.npc(pc.pc() + disp);
> pc.nnpc(pc.npc() + 4);
> PCS = pc;
132,133c146,149
< NNPC = NPC + 8;
< NPC = NPC + 4;
---
> SparcISA::PCState pc = PCS;
> pc.nnpc(pc.npc() + 8);
> pc.npc(pc.npc() + 4);
> PCS = pc;
140a157
> SparcISA::PCState pc = PCS;
142c159
< R15 = (xc->readPC())<31:0>;
---
> R15 = (pc.pc())<31:0>;
144,145c161,163
< R15 = xc->readPC();
< NNPC = R15 + disp;
---
> R15 = pc.pc();
> pc.nnpc(R15 + disp);
> PCS = pc;
318a337
> SparcISA::PCState pc = PCS;
320c339
< Rd = (xc->readPC())<31:0>;
---
> Rd = (pc.pc())<31:0>;
322c341,342
< Rd = xc->readPC();}});
---
> Rd = pc.pc();
> }});
976c996,997
< panic("M5 panic instruction called at pc=%#x.", xc->readPC());
---
> SparcISA::PCState pc = PCS;
> panic("M5 panic instruction called at pc=%#x.", pc.pc());
987a1009
> SparcISA::PCState pc = PCS;
989c1011
< Rd = (xc->readPC())<31:0>;
---
> Rd = (pc.pc())<31:0>;
991,992c1013,1015
< Rd = xc->readPC();
< NNPC = target;
---
> Rd = pc.pc();
> pc.nnpc(target);
> PCS = pc;
1013c1036,1038
< NNPC = target;
---
> SparcISA::PCState pc = PCS;
> pc.nnpc(target);
> PCS = pc;
1085,1086c1110,1113
< NPC = Tnpc;
< NNPC = Tnpc + 4;
---
> SparcISA::PCState pc = PCS;
> pc.npc(Tnpc);
> pc.nnpc(Tnpc + 4);
> PCS = pc;
1096,1097c1123,1126
< NPC = Tpc;
< NNPC = Tnpc;
---
> SparcISA::PCState pc = PCS;
> pc.npc(Tpc);
> pc.nnpc(Tnpc);
> PCS = pc;