119c119
< tc->setMiscRegNoEffect(AlphaISA::IPR_EXC_ADDR, tc->readPC());
---
> tc->setMiscRegNoEffect(IPR_EXC_ADDR, tc->readPC());
123,124c123,124
< tc->setMiscRegNoEffect(AlphaISA::IPR_EXC_ADDR,
< tc->readMiscRegNoEffect(AlphaISA::IPR_EXC_ADDR) + 4);
---
> tc->setMiscRegNoEffect(IPR_EXC_ADDR,
> tc->readMiscRegNoEffect(IPR_EXC_ADDR) + 4);
127c127
< tc->setPC(tc->readMiscRegNoEffect(AlphaISA::IPR_PAL_BASE) + vect());
---
> tc->setPC(tc->readMiscRegNoEffect(IPR_PAL_BASE) + vect());
147c147
< tc->setMiscRegNoEffect(AlphaISA::IPR_VA, vaddr);
---
> tc->setMiscRegNoEffect(IPR_VA, vaddr);
150,152c150,152
< tc->setMiscRegNoEffect(AlphaISA::IPR_MM_STAT,
< (((AlphaISA::Opcode(tc->getInst()) & 0x3f) << 11)
< | ((AlphaISA::Ra(tc->getInst()) & 0x1f) << 6)
---
> tc->setMiscRegNoEffect(IPR_MM_STAT,
> (((Opcode(tc->getInst()) & 0x3f) << 11)
> | ((Ra(tc->getInst()) & 0x1f) << 6)
156,157c156,157
< tc->setMiscRegNoEffect(AlphaISA::IPR_VA_FORM,
< tc->readMiscRegNoEffect(AlphaISA::IPR_MVPTBR) | (vaddr.vpn() << 3));
---
> tc->setMiscRegNoEffect(IPR_VA_FORM,
> tc->readMiscRegNoEffect(IPR_MVPTBR) | (vaddr.vpn() << 3));
166,169c166,169
< tc->setMiscRegNoEffect(AlphaISA::IPR_ITB_TAG, pc);
< tc->setMiscRegNoEffect(AlphaISA::IPR_IFAULT_VA_FORM,
< tc->readMiscRegNoEffect(AlphaISA::IPR_IVPTBR) |
< (AlphaISA::VAddr(pc).vpn() << 3));
---
> tc->setMiscRegNoEffect(IPR_ITB_TAG, pc);
> tc->setMiscRegNoEffect(IPR_IFAULT_VA_FORM,
> tc->readMiscRegNoEffect(IPR_IVPTBR) |
> (VAddr(pc).vpn() << 3));