145c145
< bool usermode = (tc->readMiscRegNoEffect(AlphaISA::IPR_DTB_CM) & 0x18) != 0;
---
> bool usermode = (tc->readMiscRegNoEffect(IPR_DTB_CM) & 0x18) != 0;
162c162
< Addr ksp = tc->readIntReg(AlphaISA::StackPointerReg);
---
> Addr ksp = tc->readIntReg(StackPointerReg);
218c218
< if (addr == tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp12))
---
> if (addr == tc->readMiscRegNoEffect(IPR_PALtemp12))
221c221
< if (addr == tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp7))
---
> if (addr == tc->readMiscRegNoEffect(IPR_PALtemp7))
224c224
< if (addr == tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp11))
---
> if (addr == tc->readMiscRegNoEffect(IPR_PALtemp11))
227c227
< if (addr == tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp21))
---
> if (addr == tc->readMiscRegNoEffect(IPR_PALtemp21))
230c230
< if (addr == tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp9))
---
> if (addr == tc->readMiscRegNoEffect(IPR_PALtemp9))
233c233
< if (addr == tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp2))
---
> if (addr == tc->readMiscRegNoEffect(IPR_PALtemp2))