51,52c51,52
< inline Addr VAddrVPN(Addr a) { return a >> AlphaISA::PageShift; }
< inline Addr VAddrOffset(Addr a) { return a & AlphaISA::PageOffset; }
---
> inline Addr VAddrVPN(Addr a) { return a >> PageShift; }
> inline Addr VAddrOffset(Addr a) { return a & PageOffset; }
76c76
< return addr | AlphaISA::K0SegBase;
---
> return addr | K0SegBase;
81c81
< { return reg >> 32 & (ULL(1) << PAddrImplBits - AlphaISA::PageShift) - 1; }
---
> { return reg >> 32 & (ULL(1) << PAddrImplBits - PageShift) - 1; }
91c91
< { return reg >> 32 & (ULL(1) << PAddrImplBits - AlphaISA::PageShift) - 1; }
---
> { return reg >> 32 & (ULL(1) << PAddrImplBits - PageShift) - 1; }
114,115c114,115
< inline int Opcode(AlphaISA::MachInst inst) { return inst >> 26 & 0x3f; }
< inline int Ra(AlphaISA::MachInst inst) { return inst >> 21 & 0x1f; }
---
> inline int Opcode(MachInst inst) { return inst >> 26 & 0x3f; }
> inline int Ra(MachInst inst) { return inst >> 21 & 0x1f; }