42d41
< #include "config/alpha_tlaser.hh"
218,223c217
< #if ALPHA_TLASER
< if (req->getPaddr() & PAddrUncachedBit39)
< #else
< if (req->getPaddr() & PAddrUncachedBit43)
< #endif
< {
---
> if (req->getPaddr() & PAddrUncachedBit43) {
231d224
< #if !ALPHA_TLASER
235d227
< #endif
401,407c393
< #if ALPHA_TLASER
< if ((MCSR_SP(tc->readMiscRegNoEffect(IPR_MCSR)) & 2) &&
< VAddrSpaceEV5(req->getVaddr()) == 2)
< #else
< if (VAddrSpaceEV6(req->getVaddr()) == 0x7e)
< #endif
< {
---
> if (VAddrSpaceEV6(req->getVaddr()) == 0x7e) {
417d402
< #if !ALPHA_TLASER
423,424d407
< #endif
<
498,504c481
< #if ALPHA_TLASER
< if ((MCSR_SP(tc->readMiscRegNoEffect(IPR_MCSR)) & 2) &&
< VAddrSpaceEV5(req->getVaddr()) == 2)
< #else
< if (VAddrSpaceEV6(req->getVaddr()) == 0x7e)
< #endif
< {
---
> if (VAddrSpaceEV6(req->getVaddr()) == 0x7e) {
518d494
< #if !ALPHA_TLASER
524,525d499
< #endif
<