84a85,88
> /** Returns this thread's ID number. */
> virtual int threadId() { return thread->threadId(); }
> virtual void setThreadId(int id) { return thread->setThreadId(id); }
>
155,157d158
< /** Returns this thread's ID number. */
< virtual int getThreadNum() { return thread->readTid(); }
<
193c194
< { return cpu->readPC(thread->readTid()); }
---
> { return cpu->readPC(thread->threadId()); }
200c201
< { return cpu->readNextPC(thread->readTid()); }
---
> { return cpu->readNextPC(thread->threadId()); }
206c207
< { return cpu->readMicroPC(thread->readTid()); }
---
> { return cpu->readMicroPC(thread->threadId()); }
211c212
< { return cpu->readNextMicroPC(thread->readTid()); }
---
> { return cpu->readNextMicroPC(thread->threadId()); }
217c218
< { return cpu->readMiscRegNoEffect(misc_reg, thread->readTid()); }
---
> { return cpu->readMiscRegNoEffect(misc_reg, thread->threadId()); }
222c223
< { return cpu->readMiscReg(misc_reg, thread->readTid()); }
---
> { return cpu->readMiscReg(misc_reg, thread->threadId()); }
260c261
< { return cpu->syscall(callnum, thread->readTid()); }
---
> { return cpu->syscall(callnum, thread->threadId()); }
274c275
< return this->cpu->readNextNPC(this->thread->readTid());
---
> return this->cpu->readNextNPC(this->thread->threadId());
282c283
< this->cpu->setNextNPC(val, this->thread->readTid());
---
> this->cpu->setNextNPC(val, this->thread->threadId());