164,165c164,165
< va = AlphaISA::TruncPage(va);
< last_va = AlphaISA::RoundPage(va + len);
---
> va = TruncPage(va);
> last_va = RoundPage(va + len);
168,169c168,169
< if (AlphaISA::IsK0Seg(va)) {
< if (va < (AlphaISA::K0SegBase + pmem->size())) {
---
> if (IsK0Seg(va)) {
> if (va < (K0SegBase + pmem->size())) {
187c187
< if (AlphaISA::PcPAL(va) || va < 0x10000)
---
> if (PcPAL(va) || va < 0x10000)
190,191c190,191
< Addr ptbr = context->readMiscRegNoEffect(AlphaISA::IPR_PALtemp20);
< AlphaISA::PageTableEntry pte = AlphaISA::kernel_pte_lookup(context->getPhysPort(), ptbr, va);
---
> Addr ptbr = context->readMiscRegNoEffect(IPR_PALtemp20);
> PageTableEntry pte = kernel_pte_lookup(context->getPhysPort(), ptbr, va);
196c196
< va += AlphaISA::PageBytes;
---
> va += PageBytes;
217,219c217,219
< if (AlphaISA::PcPAL(gdbregs.regs[KGDB_REG_PC])) {
< for (int i = 0; i < AlphaISA::NumIntArchRegs; ++i) {
< gdbregs.regs[i] = context->readIntReg(AlphaISA::reg_redir[i]);
---
> if (PcPAL(gdbregs.regs[KGDB_REG_PC])) {
> for (int i = 0; i < NumIntArchRegs; ++i) {
> gdbregs.regs[i] = context->readIntReg(reg_redir[i]);
222c222
< for (int i = 0; i < AlphaISA::NumIntArchRegs; ++i) {
---
> for (int i = 0; i < NumIntArchRegs; ++i) {
228c228
< for (int i = 0; i < AlphaISA::NumFloatArchRegs; ++i) {
---
> for (int i = 0; i < NumFloatArchRegs; ++i) {
244,246c244,246
< if (AlphaISA::PcPAL(gdbregs.regs[KGDB_REG_PC])) {
< for (int i = 0; i < AlphaISA::NumIntArchRegs; ++i) {
< context->setIntReg(AlphaISA::reg_redir[i], gdbregs.regs[i]);
---
> if (PcPAL(gdbregs.regs[KGDB_REG_PC])) {
> for (int i = 0; i < NumIntArchRegs; ++i) {
> context->setIntReg(reg_redir[i], gdbregs.regs[i]);
249c249
< for (int i = 0; i < AlphaISA::NumIntArchRegs; ++i) {
---
> for (int i = 0; i < NumIntArchRegs; ++i) {
255c255
< for (int i = 0; i < AlphaISA::NumFloatArchRegs; ++i) {
---
> for (int i = 0; i < NumFloatArchRegs; ++i) {