71,80d70
< ////////////////////////////////////////////////////////////////////////
< //
< //
< //
< void
< AlphaISA::initIPRs(ThreadContext *tc, int cpuId)
< {
< for (int i = 0; i < NumInternalProcRegs; ++i) {
< tc->setMiscRegNoEffect(i, 0);
< }
82,87d71
< tc->setMiscRegNoEffect(IPR_PAL_BASE, PalBase);
< tc->setMiscRegNoEffect(IPR_MCSR, 0x6);
< tc->setMiscRegNoEffect(IPR_PALtemp16, cpuId);
< }
<
<
173a158,175
> #endif
>
> ////////////////////////////////////////////////////////////////////////
> //
> //
> //
> void
> AlphaISA::initIPRs(ThreadContext *tc, int cpuId)
> {
> for (int i = 0; i < NumInternalProcRegs; ++i) {
> tc->setMiscRegNoEffect(i, 0);
> }
>
> tc->setMiscRegNoEffect(IPR_PAL_BASE, EV5::PalBase);
> tc->setMiscRegNoEffect(IPR_MCSR, 0x6);
> tc->setMiscRegNoEffect(IPR_PALtemp16, cpuId);
> }
>
342a345
> #if FULL_SYSTEM
344a348
> #endif
370a375
> #if FULL_SYSTEM
372a378
> #endif
375a382
> #if FULL_SYSTEM
382a390
> #endif
471c479
< DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]));
---
> EV5::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]));
478c486
< if (DTB_PTE_GH(ipr[AlphaISA::IPR_DTB_PTE]) != 0)
---
> if (EV5::DTB_PTE_GH(ipr[AlphaISA::IPR_DTB_PTE]) != 0)
485,491c493,499
< pte.ppn = DTB_PTE_PPN(ipr[AlphaISA::IPR_DTB_PTE]);
< pte.xre = DTB_PTE_XRE(ipr[AlphaISA::IPR_DTB_PTE]);
< pte.xwe = DTB_PTE_XWE(ipr[AlphaISA::IPR_DTB_PTE]);
< pte.fonr = DTB_PTE_FONR(ipr[AlphaISA::IPR_DTB_PTE]);
< pte.fonw = DTB_PTE_FONW(ipr[AlphaISA::IPR_DTB_PTE]);
< pte.asma = DTB_PTE_ASMA(ipr[AlphaISA::IPR_DTB_PTE]);
< pte.asn = DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]);
---
> pte.ppn = EV5::DTB_PTE_PPN(ipr[AlphaISA::IPR_DTB_PTE]);
> pte.xre = EV5::DTB_PTE_XRE(ipr[AlphaISA::IPR_DTB_PTE]);
> pte.xwe = EV5::DTB_PTE_XWE(ipr[AlphaISA::IPR_DTB_PTE]);
> pte.fonr = EV5::DTB_PTE_FONR(ipr[AlphaISA::IPR_DTB_PTE]);
> pte.fonw = EV5::DTB_PTE_FONW(ipr[AlphaISA::IPR_DTB_PTE]);
> pte.asma = EV5::DTB_PTE_ASMA(ipr[AlphaISA::IPR_DTB_PTE]);
> pte.asn = EV5::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]);
502c510
< if (ITB_PTE_GH(val) != 0)
---
> if (EV5::ITB_PTE_GH(val) != 0)
509,510c517,518
< pte.ppn = ITB_PTE_PPN(val);
< pte.xre = ITB_PTE_XRE(val);
---
> pte.ppn = EV5::ITB_PTE_PPN(val);
> pte.xre = EV5::ITB_PTE_XRE(val);
512,515c520,523
< pte.fonr = ITB_PTE_FONR(val);
< pte.fonw = ITB_PTE_FONW(val);
< pte.asma = ITB_PTE_ASMA(val);
< pte.asn = ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]);
---
> pte.fonr = EV5::ITB_PTE_FONR(val);
> pte.fonw = EV5::ITB_PTE_FONW(val);
> pte.asma = EV5::ITB_PTE_ASMA(val);
> pte.asn = EV5::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]);
541c549
< ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]));
---
> EV5::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]));
560a569
> #if FULL_SYSTEM