495c495
< if (req->isUncacheable() &&
---
> if (req->getFlags() & UNCACHEABLE &&
512c512
< if (req->isLocked()) {
---
> if (req->getFlags() & LOCKED) {
640a641,645
> if (data_pkt->result == Packet::BadAddress) {
> delete data_pkt;
> return TheISA::genMachineCheckFault();
> }
>