5c5
< #include "cpu/exec_context.hh"
---
> #include "cpu/thread_context.hh"
118c118
< System::registerExecContext(ExecContext *xc, int id)
---
> System::registerThreadContext(ThreadContext *tc, int id)
121,122c121,122
< for (id = 0; id < execContexts.size(); id++) {
< if (!execContexts[id])
---
> for (id = 0; id < threadContexts.size(); id++) {
> if (!threadContexts[id])
127,128c127,128
< if (execContexts.size() <= id)
< execContexts.resize(id + 1);
---
> if (threadContexts.size() <= id)
> threadContexts.resize(id + 1);
130c130
< if (execContexts[id])
---
> if (threadContexts[id])
133c133
< execContexts[id] = xc;
---
> threadContexts[id] = tc;
137c137
< RemoteGDB *rgdb = new RemoteGDB(this, xc);
---
> RemoteGDB *rgdb = new RemoteGDB(this, tc);
161,162c161,162
< for (i = 0; i < execContexts.size(); i++)
< execContexts[i]->activate(0);
---
> for (i = 0; i < threadContexts.size(); i++)
> threadContexts[i]->activate(0);
166c166
< System::replaceExecContext(ExecContext *xc, int id)
---
> System::replaceThreadContext(ThreadContext *tc, int id)
168,170c168,170
< if (id >= execContexts.size()) {
< panic("replaceExecContext: bad id, %d >= %d\n",
< id, execContexts.size());
---
> if (id >= threadContexts.size()) {
> panic("replaceThreadContext: bad id, %d >= %d\n",
> id, threadContexts.size());
173c173
< execContexts[id] = xc;
---
> threadContexts[id] = tc;
175c175
< remoteGDB[id]->replaceExecContext(xc);
---
> remoteGDB[id]->replaceThreadContext(tc);