853,856c853,854
< PCState pc = PCS;
< xc->setMiscReg(IPR_EXC_ADDR, pc.npc());
< pc.npc(xc->readMiscReg(IPR_PAL_BASE) + palOffset);
< PCS = pc;
---
> xc->setMiscReg(IPR_EXC_ADDR, NPC);
> NPC = xc->readMiscReg(IPR_PAL_BASE) + palOffset;
1022,1023c1020
< panic("M5 panic instruction called at pc=%#x.",
< xc->pcState().pc());
---
> panic("M5 panic instruction called at pc = %#x.", PC);
1028,1029c1025,1026
< panic("Deprecated M5 annotate instruction executed at pc=%#x\n",
< xc->pcState().pc());
---
> panic("Deprecated M5 annotate instruction executed "
> "at pc = %#x\n", PC);