332c332
< uint64_t threadPC = thread->readPC();
---
> Addr threadPC = thread->readPC();
343,344c343,344
< const Addr PCMask = ~(sizeof(MachInst) - 1);
< Addr fetchPC = thread->readPC() + fetchOffset;
---
> const Addr PCMask = ~((Addr)sizeof(MachInst) - 1);
> Addr fetchPC = threadPC + fetchOffset;
383c383
< const Addr PCMask = ~(sizeof(MachInst) - 1);
---
> const Addr PCMask = ~((Addr)sizeof(MachInst) - 1);