66a67
> setThreadId(old_context->threadId());
98c99
< getThreadNum());
---
> threadId());
108c109
< cpu->activateWhenReady(thread->readTid());
---
> cpu->activateWhenReady(thread->threadId());
115c116
< cpu->activateContext(thread->readTid(), delay);
---
> cpu->activateContext(thread->threadId(), delay);
123c124
< getThreadNum());
---
> threadId());
142c143
< cpu->suspendContext(thread->readTid());
---
> cpu->suspendContext(thread->threadId());
150c151
< getThreadNum(), delay);
---
> threadId(), delay);
156c157
< cpu->deallocateContext(thread->readTid(), true, delay);
---
> cpu->deallocateContext(thread->threadId(), true, delay);
164c165
< getThreadNum());
---
> threadId());
170c171
< cpu->haltContext(thread->readTid());
---
> cpu->haltContext(thread->threadId());
248c249
< unsigned tid = thread->readTid();
---
> unsigned tid = thread->threadId();
295c296
< return cpu->readArchIntReg(reg_idx, thread->readTid());
---
> return cpu->readArchIntReg(reg_idx, thread->threadId());
305c306
< return cpu->readArchFloatRegSingle(reg_idx, thread->readTid());
---
> return cpu->readArchFloatRegSingle(reg_idx, thread->threadId());
307c308
< return cpu->readArchFloatRegDouble(reg_idx, thread->readTid());
---
> return cpu->readArchFloatRegDouble(reg_idx, thread->threadId());
319c320
< return cpu->readArchFloatRegSingle(reg_idx, thread->readTid());
---
> return cpu->readArchFloatRegSingle(reg_idx, thread->threadId());
328c329
< return cpu->readArchFloatRegInt(reg_idx, thread->readTid());
---
> return cpu->readArchFloatRegInt(reg_idx, thread->threadId());
336c337
< return cpu->readArchFloatRegInt(reg_idx, thread->readTid());
---
> return cpu->readArchFloatRegInt(reg_idx, thread->threadId());
344c345
< cpu->setArchIntReg(reg_idx, val, thread->readTid());
---
> cpu->setArchIntReg(reg_idx, val, thread->threadId());
348c349
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
359c360
< cpu->setArchFloatRegSingle(reg_idx, val, thread->readTid());
---
> cpu->setArchFloatRegSingle(reg_idx, val, thread->threadId());
362c363
< cpu->setArchFloatRegDouble(reg_idx, val, thread->readTid());
---
> cpu->setArchFloatRegDouble(reg_idx, val, thread->threadId());
368c369
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
377c378
< cpu->setArchFloatRegSingle(reg_idx, val, thread->readTid());
---
> cpu->setArchFloatRegSingle(reg_idx, val, thread->threadId());
380c381
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
391c392
< cpu->setArchFloatRegInt(reg_idx, val, thread->readTid());
---
> cpu->setArchFloatRegInt(reg_idx, val, thread->threadId());
395c396
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
404c405
< cpu->setArchFloatRegInt(reg_idx, val, thread->readTid());
---
> cpu->setArchFloatRegInt(reg_idx, val, thread->threadId());
408c409
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
416c417
< cpu->setPC(val, thread->readTid());
---
> cpu->setPC(val, thread->threadId());
420c421
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
428c429
< cpu->setNextPC(val, thread->readTid());
---
> cpu->setNextPC(val, thread->threadId());
432c433
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
440c441
< cpu->setMicroPC(val, thread->readTid());
---
> cpu->setMicroPC(val, thread->threadId());
444c445
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
452c453
< cpu->setNextMicroPC(val, thread->readTid());
---
> cpu->setNextMicroPC(val, thread->threadId());
456c457
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
464c465
< cpu->setMiscRegNoEffect(misc_reg, val, thread->readTid());
---
> cpu->setMiscRegNoEffect(misc_reg, val, thread->threadId());
468c469
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
477c478
< cpu->setMiscReg(misc_reg, val, thread->readTid());
---
> cpu->setMiscReg(misc_reg, val, thread->threadId());
481c482
< cpu->squashFromTC(thread->readTid());
---
> cpu->squashFromTC(thread->threadId());
491c492
< return cpu->getSyscallArg(i, thread->readTid());
---
> return cpu->getSyscallArg(i, thread->threadId());
498c499
< cpu->setSyscallArg(i, val, thread->readTid());
---
> cpu->setSyscallArg(i, val, thread->threadId());
505c506
< cpu->setSyscallReturn(return_value, thread->readTid());
---
> cpu->setSyscallReturn(return_value, thread->threadId());