181a182,183
> PCState pc = context->pcState();
>
186,187c188,189
< regs[Reg32Pc] = htobe((uint32_t)context->readPC());
< regs[Reg32Npc] = htobe((uint32_t)context->readNextPC());
---
> regs[Reg32Pc] = htobe((uint32_t)pc.pc());
> regs[Reg32Npc] = htobe((uint32_t)pc.npc());
196,197c198,199
< gdbregs.regs[RegPc] = htobe(context->readPC());
< gdbregs.regs[RegNpc] = htobe(context->readNextPC());
---
> gdbregs.regs[RegPc] = htobe(pc.pc());
> gdbregs.regs[RegNpc] = htobe(pc.npc());
227,228c229,235
< context->setPC(gdbregs.regs[RegPc]);
< context->setNextPC(gdbregs.regs[RegNpc]);
---
> PCState pc;
> pc.pc(gdbregs.regs[RegPc]);
> pc.npc(gdbregs.regs[RegNpc]);
> pc.nnpc(pc.npc() + sizeof(MachInst));
> pc.upc(0);
> pc.nupc(1);
> context->pcState(pc);
244c251
< nextBkpt = context->readNextPC();
---
> nextBkpt = context->pcState().npc();