81c81
< warn("%i: Halting thread %i in %s @ PC %x, setting restart PC to %x", curTick, tc->getThreadNum(), tc->getCpuPtr()->name(),
---
> warn("%i: Halting thread %i in %s @ PC %x, setting restart PC to %x", curTick, tc->threadId(), tc->getCpuPtr()->name(),
101c101
< warn("%i: Restoring thread %i in %s @ PC %x", curTick, tc->getThreadNum(), tc->getCpuPtr()->name(),
---
> warn("%i: Restoring thread %i in %s @ PC %x", curTick, tc->threadId(), tc->getCpuPtr()->name(),
220c220
< warn("%i: Deactivating Hardware Thread Context #%i", curTick, tc->getThreadNum());
---
> warn("%i: Deactivating Hardware Thread Context #%i", curTick, tc->threadId());
241c241
< //std::cerr << "T" << tc->getThreadNum() << "YIELD: Schedule Other Threads.\n" << std::endl;
---
> //std::cerr << "T" << tc->threadId() << "YIELD: Schedule Other Threads.\n" << std::endl;