641c641
< FNPC = NPC | (1ULL << PcJBitShift) | (1ULL << PcTBitShift);
---
> FNPC = NPC | PcJBit | PcTBit;
651c651
< FNPC = (NPC & ~(1ULL << PcJBitShift)) | (1ULL << PcTBitShift);
---
> FNPC = (NPC & ~PcJBit) | PcTBit;