224d223
< PCState pc = PCS;
226,227c225,227
< pc.npc(pc.npc() + disp);
< PCS = pc;
---
> NPC = NPC + disp;
> else
> NPC = NPC;
240,241c240
< readpc_code = 'PCState pc = PCS;'
< nolink_code = 'pc.npc(%s);\nPCS = pc' % npc_expr
---
> nolink_code = 'NPC = %s;\n' % npc_expr
243c242
< readpc_code + nolink_code, flags)
---
> nolink_code, flags)
249c248
< link_code = 'Ra = pc.npc() & ~3;\n' + nolink_code
---
> link_code = 'Ra = NPC & ~3;\n' + nolink_code
251c250
< readpc_code + link_code, flags)
---
> link_code, flags)
266c265
< UncondCtrlBase(name, Name, 'Branch', 'pc.npc() + disp', flags)
---
> UncondCtrlBase(name, Name, 'Branch', 'NPC + disp', flags)
272c271
< UncondCtrlBase(name, Name, 'Jump', '(Rb & ~3) | (pc.npc() & 1)', flags)
---
> UncondCtrlBase(name, Name, 'Jump', '(Rb & ~3) | (NPC & 1)', flags)