39c39
< #include "cpu/exec_context.hh"
---
> #include "cpu/thread_context.hh"
45,46c45,46
< ProcessInfo::ProcessInfo(ExecContext *_xc)
< : xc(_xc)
---
> ProcessInfo::ProcessInfo(ThreadContext *_tc)
> : tc(_tc)
50c50
< if (!xc->getSystemPtr()->kernelSymtab->findAddress("thread_info_size", addr))
---
> if (!tc->getSystemPtr()->kernelSymtab->findAddress("thread_info_size", addr))
52c52
< thread_info_size = gtoh(xc->getVirtPort()->read<int32_t>(addr));
---
> thread_info_size = gtoh(tc->getVirtPort()->read<int32_t>(addr));
54c54
< if (!xc->getSystemPtr()->kernelSymtab->findAddress("task_struct_size", addr))
---
> if (!tc->getSystemPtr()->kernelSymtab->findAddress("task_struct_size", addr))
56c56
< task_struct_size = gtoh(xc->getVirtPort()->read<int32_t>(addr));
---
> task_struct_size = gtoh(tc->getVirtPort()->read<int32_t>(addr));
58c58
< if (!xc->getSystemPtr()->kernelSymtab->findAddress("thread_info_task", addr))
---
> if (!tc->getSystemPtr()->kernelSymtab->findAddress("thread_info_task", addr))
60c60
< task_off = gtoh(xc->getVirtPort()->read<int32_t>(addr));
---
> task_off = gtoh(tc->getVirtPort()->read<int32_t>(addr));
62c62
< if (!xc->getSystemPtr()->kernelSymtab->findAddress("task_struct_pid", addr))
---
> if (!tc->getSystemPtr()->kernelSymtab->findAddress("task_struct_pid", addr))
64c64
< pid_off = gtoh(xc->getVirtPort()->read<int32_t>(addr));
---
> pid_off = gtoh(tc->getVirtPort()->read<int32_t>(addr));
66c66
< if (!xc->getSystemPtr()->kernelSymtab->findAddress("task_struct_comm", addr))
---
> if (!tc->getSystemPtr()->kernelSymtab->findAddress("task_struct_comm", addr))
68c68
< name_off = gtoh(xc->getVirtPort()->read<int32_t>(addr));
---
> name_off = gtoh(tc->getVirtPort()->read<int32_t>(addr));
78c78
< return gtoh(xc->getVirtPort()->read<Addr>(base + task_off));
---
> return gtoh(tc->getVirtPort()->read<Addr>(base + task_off));
88c88
< return gtoh(xc->getVirtPort()->read<uint16_t>(task + pid_off));
---
> return gtoh(tc->getVirtPort()->read<uint16_t>(task + pid_off));
99c99
< CopyStringOut(xc, comm, task + name_off, sizeof(comm));
---
> CopyStringOut(tc, comm, task + name_off, sizeof(comm));
107c107
< : xc(0), stack(64)
---
> : tc(0), stack(64)
111,112c111,112
< StackTrace::StackTrace(ExecContext *_xc, StaticInstPtr inst)
< : xc(0), stack(64)
---
> StackTrace::StackTrace(ThreadContext *_tc, StaticInstPtr inst)
> : tc(0), stack(64)
114c114
< trace(_xc, inst);
---
> trace(_tc, inst);
122c122
< StackTrace::trace(ExecContext *_xc, bool is_call)
---
> StackTrace::trace(ThreadContext *_tc, bool is_call)
124c124
< xc = _xc;
---
> tc = _tc;
126c126
< bool usermode = (xc->readMiscReg(AlphaISA::IPR_DTB_CM) & 0x18) != 0;
---
> bool usermode = (tc->readMiscReg(AlphaISA::IPR_DTB_CM) & 0x18) != 0;
128,130c128,130
< Addr pc = xc->readNextPC();
< bool kernel = xc->getSystemPtr()->kernelStart <= pc &&
< pc <= xc->getSystemPtr()->kernelEnd;
---
> Addr pc = tc->readNextPC();
> bool kernel = tc->getSystemPtr()->kernelStart <= pc &&
> pc <= tc->getSystemPtr()->kernelEnd;
142,143c142,143
< SymbolTable *symtab = xc->getSystemPtr()->kernelSymtab;
< Addr ksp = xc->readIntReg(TheISA::StackPointerReg);
---
> SymbolTable *symtab = tc->getSystemPtr()->kernelSymtab;
> Addr ksp = tc->readIntReg(TheISA::StackPointerReg);
152c152
< pc = xc->readPC();
---
> pc = tc->readPC();
184,185c184,185
< bool kernel = xc->getSystemPtr()->kernelStart <= pc &&
< pc <= xc->getSystemPtr()->kernelEnd;
---
> bool kernel = tc->getSystemPtr()->kernelStart <= pc &&
> pc <= tc->getSystemPtr()->kernelEnd;
199c199
< if (addr == xc->readMiscReg(AlphaISA::IPR_PALtemp12))
---
> if (addr == tc->readMiscReg(AlphaISA::IPR_PALtemp12))
202c202
< if (addr == xc->readMiscReg(AlphaISA::IPR_PALtemp7))
---
> if (addr == tc->readMiscReg(AlphaISA::IPR_PALtemp7))
205c205
< if (addr == xc->readMiscReg(AlphaISA::IPR_PALtemp11))
---
> if (addr == tc->readMiscReg(AlphaISA::IPR_PALtemp11))
208c208
< if (addr == xc->readMiscReg(AlphaISA::IPR_PALtemp21))
---
> if (addr == tc->readMiscReg(AlphaISA::IPR_PALtemp21))
211c211
< if (addr == xc->readMiscReg(AlphaISA::IPR_PALtemp9))
---
> if (addr == tc->readMiscReg(AlphaISA::IPR_PALtemp9))
214c214
< if (addr == xc->readMiscReg(AlphaISA::IPR_PALtemp2))
---
> if (addr == tc->readMiscReg(AlphaISA::IPR_PALtemp2))
299c299
< CopyOut(xc, (uint8_t *)&inst, pc, sizeof(MachInst));
---
> CopyOut(tc, (uint8_t *)&inst, pc, sizeof(MachInst));
310c310
< CopyOut(xc, (uint8_t *)&ra, sp + disp, sizeof(Addr));
---
> CopyOut(tc, (uint8_t *)&ra, sp + disp, sizeof(Addr));
326,327c326,327
< StringWrap name(xc->getCpuPtr()->name());
< SymbolTable *symtab = xc->getSystemPtr()->kernelSymtab;
---
> StringWrap name(tc->getCpuPtr()->name());
> SymbolTable *symtab = tc->getSystemPtr()->kernelSymtab;