41c41
< #include "cpu/exec_context.hh"
---
> #include "cpu/thread_context.hh"
55c55
< AlphaISA::initCPU(ExecContext *xc, int cpuId)
---
> AlphaISA::initCPU(ThreadContext *tc, int cpuId)
57c57
< initIPRs(xc, cpuId);
---
> initIPRs(tc, cpuId);
59,60c59,60
< xc->setIntReg(16, cpuId);
< xc->setIntReg(0, cpuId);
---
> tc->setIntReg(16, cpuId);
> tc->setIntReg(0, cpuId);
62,63c62,63
< xc->setPC(xc->readMiscReg(IPR_PAL_BASE) + (new ResetFault)->vect());
< xc->setNextPC(xc->readPC() + sizeof(MachInst));
---
> tc->setPC(tc->readMiscReg(IPR_PAL_BASE) + (new ResetFault)->vect());
> tc->setNextPC(tc->readPC() + sizeof(MachInst));
71c71
< AlphaISA::initIPRs(ExecContext *xc, int cpuId)
---
> AlphaISA::initIPRs(ThreadContext *tc, int cpuId)
74c74
< xc->setMiscReg(i, 0);
---
> tc->setMiscReg(i, 0);
77,79c77,79
< xc->setMiscReg(IPR_PAL_BASE, PalBase);
< xc->setMiscReg(IPR_MCSR, 0x6);
< xc->setMiscReg(IPR_PALtemp16, cpuId);
---
> tc->setMiscReg(IPR_PAL_BASE, PalBase);
> tc->setMiscReg(IPR_MCSR, 0x6);
> tc->setMiscReg(IPR_PALtemp16, cpuId);
174c174
< AlphaISA::MiscRegFile::readIpr(int idx, Fault &fault, ExecContext *xc)
---
> AlphaISA::MiscRegFile::readIpr(int idx, Fault &fault, ThreadContext *tc)
228c228
< retval |= xc->getCpuPtr()->curCycle() & ULL(0x00000000ffffffff);
---
> retval |= tc->getCpuPtr()->curCycle() & ULL(0x00000000ffffffff);
245c245
< AlphaISA::PTE &pte = xc->getDTBPtr()->index(!xc->misspeculating());
---
> AlphaISA::PTE &pte = tc->getDTBPtr()->index(!tc->misspeculating());
285c285
< AlphaISA::MiscRegFile::setIpr(int idx, uint64_t val, ExecContext *xc)
---
> AlphaISA::MiscRegFile::setIpr(int idx, uint64_t val, ThreadContext *tc)
289c289
< if (xc->misspeculating())
---
> if (tc->misspeculating())
342,343c342,343
< if (xc->getKernelStats())
< xc->getKernelStats()->context(old, val, xc);
---
> if (tc->getKernelStats())
> tc->getKernelStats()->context(old, val, tc);
370,371c370,371
< if (xc->getKernelStats())
< xc->getKernelStats()->swpipl(ipr[idx]);
---
> if (tc->getKernelStats())
> tc->getKernelStats()->swpipl(ipr[idx]);
376,377c376,377
< if (xc->getKernelStats())
< xc->getKernelStats()->mode(Kernel::user, xc);
---
> if (tc->getKernelStats())
> tc->getKernelStats()->mode(Kernel::user, tc);
379,380c379,380
< if (xc->getKernelStats())
< xc->getKernelStats()->mode(Kernel::kernel, xc);
---
> if (tc->getKernelStats())
> tc->getKernelStats()->mode(Kernel::kernel, tc);
455c455
< xc->getDTBPtr()->flushAll();
---
> tc->getDTBPtr()->flushAll();
462c462
< xc->getDTBPtr()->flushProcesses();
---
> tc->getDTBPtr()->flushProcesses();
469c469
< xc->getDTBPtr()->flushAddr(val,
---
> tc->getDTBPtr()->flushAddr(val,
493c493
< xc->getDTBPtr()->insert(val, pte);
---
> tc->getDTBPtr()->insert(val, pte);
517c517
< xc->getITBPtr()->insert(ipr[AlphaISA::IPR_ITB_TAG], pte);
---
> tc->getITBPtr()->insert(ipr[AlphaISA::IPR_ITB_TAG], pte);
525c525
< xc->getITBPtr()->flushAll();
---
> tc->getITBPtr()->flushAll();
532c532
< xc->getITBPtr()->flushProcesses();
---
> tc->getITBPtr()->flushProcesses();
539c539
< xc->getITBPtr()->flushAddr(val,
---
> tc->getITBPtr()->flushAddr(val,
553c553
< AlphaISA::copyIprs(ExecContext *src, ExecContext *dest)
---
> AlphaISA::copyIprs(ThreadContext *src, ThreadContext *dest)
568c568
< kernelStats->callpal(palFunc, proxy);
---
> kernelStats->callpal(palFunc, tc);