299c299
< int _contextId;
---
> ContextID _contextId;
356c356
< Addr pc, int cid, ThreadID tid)
---
> Addr pc, ContextID cid, ThreadID tid)
372c372
< setThreadContext(int context_id, ThreadID tid)
---
> setThreadContext(ContextID context_id, ThreadID tid)
594c594
< int
---
> ContextID