288c288
< system->registerThreadContext(tc);
---
> tc->setContextId(system->registerThreadContext(tc));
290c290
< tc->getProcessPtr()->assignThreadContext(tc->cpuId());
---
> tc->getProcessPtr()->assignThreadContext(tc->contextId());
331,332c331,332
< assert(newTC->cpuId() == oldTC->cpuId());
< system->replaceThreadContext(newTC, newTC->cpuId());
---
> assert(newTC->contextId() == oldTC->contextId());
> system->replaceThreadContext(newTC, newTC->contextId());