212,213c212,213
< int
< System::registerThreadContext(ThreadContext *tc, int assigned)
---
> ContextID
> System::registerThreadContext(ThreadContext *tc, ContextID assigned)
216c216
< if (assigned == -1) {
---
> if (assigned == InvalidContextID) {
308c308
< System::replaceThreadContext(ThreadContext *tc, int context_id)
---
> System::replaceThreadContext(ThreadContext *tc, ContextID context_id)