43d42
< using namespace AlphaISA;
45,46c44,47
< AlphaISA::PageTableEntry
< AlphaISA::kernel_pte_lookup(FunctionalPort *mem, Addr ptbr, AlphaISA::VAddr vaddr)
---
> namespace AlphaISA {
>
> PageTableEntry
> kernel_pte_lookup(FunctionalPort *mem, Addr ptbr, VAddr vaddr)
49c50
< AlphaISA::PageTableEntry level1 = mem->read<uint64_t>(level1_pte);
---
> PageTableEntry level1 = mem->read<uint64_t>(level1_pte);
56c57
< AlphaISA::PageTableEntry level2 = mem->read<uint64_t>(level2_pte);
---
> PageTableEntry level2 = mem->read<uint64_t>(level2_pte);
63c64
< AlphaISA::PageTableEntry level3 = mem->read<uint64_t>(level3_pte);
---
> PageTableEntry level3 = mem->read<uint64_t>(level3_pte);
72c73
< AlphaISA::vtophys(Addr vaddr)
---
> vtophys(Addr vaddr)
75c76
< if (AlphaISA::IsUSeg(vaddr))
---
> if (IsUSeg(vaddr))
77,78c78,79
< else if (AlphaISA::IsK0Seg(vaddr))
< paddr = AlphaISA::K0Seg2Phys(vaddr);
---
> else if (IsK0Seg(vaddr))
> paddr = K0Seg2Phys(vaddr);
88c89
< AlphaISA::vtophys(ThreadContext *tc, Addr addr)
---
> vtophys(ThreadContext *tc, Addr addr)
90,91c91,92
< AlphaISA::VAddr vaddr = addr;
< Addr ptbr = tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp20);
---
> VAddr vaddr = addr;
> Addr ptbr = tc->readMiscRegNoEffect(IPR_PALtemp20);
95c96
< if (AlphaISA::PcPAL(vaddr) && (vaddr < AlphaISA::PalMax)) {
---
> if (PcPAL(vaddr) && (vaddr < PalMax)) {
98,99c99,100
< if (AlphaISA::IsK0Seg(vaddr)) {
< paddr = AlphaISA::K0Seg2Phys(vaddr);
---
> if (IsK0Seg(vaddr)) {
> paddr = K0Seg2Phys(vaddr);
103c104
< AlphaISA::PageTableEntry pte =
---
> PageTableEntry pte =
115a117,118
> } // namespace AlphaISA
>