211a212
> protected:
229a231,232
> public:
>
393c396,403
< Addr readNextNPC() { return nextNPC; }
---
> Addr readNextNPC()
> {
> #if ISA_HAS_DELAY_SLOT
> return nextNPC;
> #else
> return nextPC + sizeof(TheISA::MachInst);
> #endif
> }
422c432,433
< return predPC != nextPC || predNPC != nextNPC;
---
> return readPredPC() != readNextPC() ||
> readPredNPC() != readNextNPC();