46a47,48
> using namespace AlphaISA;
>
49,50d50
< using namespace EV5;
<
149c149
< return EV5::ITB_ASN_ASN(ipr[IPR_ITB_ASN]);
---
> return AlphaISA::ITB_ASN_ASN(ipr[IPR_ITB_ASN]);
155c155
< return EV5::DTB_ASN_ASN(ipr[IPR_DTB_ASN]);
---
> return AlphaISA::DTB_ASN_ASN(ipr[IPR_DTB_ASN]);
171c171
< tc->setMiscRegNoEffect(IPR_PAL_BASE, EV5::PalBase);
---
> tc->setMiscRegNoEffect(IPR_PAL_BASE, AlphaISA::PalBase);
480c480
< EV5::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]));
---
> AlphaISA::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]));
487c487
< if (EV5::DTB_PTE_GH(ipr[AlphaISA::IPR_DTB_PTE]) != 0)
---
> if (AlphaISA::DTB_PTE_GH(ipr[AlphaISA::IPR_DTB_PTE]) != 0)
494,500c494,500
< entry.ppn = EV5::DTB_PTE_PPN(ipr[AlphaISA::IPR_DTB_PTE]);
< entry.xre = EV5::DTB_PTE_XRE(ipr[AlphaISA::IPR_DTB_PTE]);
< entry.xwe = EV5::DTB_PTE_XWE(ipr[AlphaISA::IPR_DTB_PTE]);
< entry.fonr = EV5::DTB_PTE_FONR(ipr[AlphaISA::IPR_DTB_PTE]);
< entry.fonw = EV5::DTB_PTE_FONW(ipr[AlphaISA::IPR_DTB_PTE]);
< entry.asma = EV5::DTB_PTE_ASMA(ipr[AlphaISA::IPR_DTB_PTE]);
< entry.asn = EV5::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]);
---
> entry.ppn = AlphaISA::DTB_PTE_PPN(ipr[AlphaISA::IPR_DTB_PTE]);
> entry.xre = AlphaISA::DTB_PTE_XRE(ipr[AlphaISA::IPR_DTB_PTE]);
> entry.xwe = AlphaISA::DTB_PTE_XWE(ipr[AlphaISA::IPR_DTB_PTE]);
> entry.fonr = AlphaISA::DTB_PTE_FONR(ipr[AlphaISA::IPR_DTB_PTE]);
> entry.fonw = AlphaISA::DTB_PTE_FONW(ipr[AlphaISA::IPR_DTB_PTE]);
> entry.asma = AlphaISA::DTB_PTE_ASMA(ipr[AlphaISA::IPR_DTB_PTE]);
> entry.asn = AlphaISA::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]);
511c511
< if (EV5::ITB_PTE_GH(val) != 0)
---
> if (AlphaISA::ITB_PTE_GH(val) != 0)
518,519c518,519
< entry.ppn = EV5::ITB_PTE_PPN(val);
< entry.xre = EV5::ITB_PTE_XRE(val);
---
> entry.ppn = AlphaISA::ITB_PTE_PPN(val);
> entry.xre = AlphaISA::ITB_PTE_XRE(val);
521,524c521,524
< entry.fonr = EV5::ITB_PTE_FONR(val);
< entry.fonw = EV5::ITB_PTE_FONW(val);
< entry.asma = EV5::ITB_PTE_ASMA(val);
< entry.asn = EV5::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]);
---
> entry.fonr = AlphaISA::ITB_PTE_FONR(val);
> entry.fonw = AlphaISA::ITB_PTE_FONW(val);
> entry.asma = AlphaISA::ITB_PTE_ASMA(val);
> entry.asn = AlphaISA::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]);
550c550
< EV5::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]));
---
> AlphaISA::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]));