69d68
< ThreadContext * context = cpu->threadContexts[0];
71c70
< sprintf(buf, "PC = 0x%016llx", context->readNextPC());
---
> sprintf(buf, "PC = 0x%016llx", thread->readNextPC());
73c72
< sprintf(buf, " NPC = 0x%016llx", context->readNextNPC());
---
> sprintf(buf, " NPC = 0x%016llx", thread->readNextNPC());
75c74
< newVal = context->readMiscReg(SparcISA::MISCREG_CCR);
---
> newVal = thread->readMiscReg(SparcISA::MISCREG_CCR);
82c81
< newVal = context->readMiscReg(SparcISA::MISCREG_Y);
---
> newVal = thread->readMiscReg(SparcISA::MISCREG_Y);
94c93
< newVal = context->readIntReg(index);
---
> newVal = thread->readIntReg(index);
105c104
< newVal = context->readFloatRegBits(2 * y, 64);
---
> newVal = thread->readFloatRegBits(2 * y, 64);
114,140d112
< /*
< int numSources = staticInst->numSrcRegs();
< int numDests = staticInst->numDestRegs();
< outs << "Sources:";
< for(int x = 0; x < numSources; x++)
< {
< int sourceNum = staticInst->srcRegIdx(x);
< if(sourceNum < FP_Base_DepTag)
< outs << " " << getIntRegName(sourceNum);
< else if(sourceNum < Ctrl_Base_DepTag)
< outs << " " << getFloatRegName(sourceNum - FP_Base_DepTag);
< else
< outs << " " << getMiscRegName(sourceNum - Ctrl_Base_DepTag);
< }
< outs << endl;
< outs << "Destinations:";
< for(int x = 0; x < numDests; x++)
< {
< int destNum = staticInst->destRegIdx(x);
< if(destNum < FP_Base_DepTag)
< outs << " " << getIntRegName(destNum);
< else if(destNum < Ctrl_Base_DepTag)
< outs << " " << getFloatRegName(destNum - FP_Base_DepTag);
< else
< outs << " " << getMiscRegName(destNum - Ctrl_Base_DepTag);
< }
< outs << endl;*/
144c116
< bool is_trace_system = (cpu->system->name() == trace_system);
---
> bool is_trace_system = (thread->getCpuPtr()->system->name() == trace_system);
164c136
< outs << cpu->name() << " ";
---
> outs << thread->getCpuPtr()->name() << " ";
170c142
< outs << "T" << thread << " : ";
---
> outs << "T" << thread->getThreadNum() << " : ";