43c43
< #include "cpu/exec_context.hh"
---
> #include "cpu/thread_context.hh"
137c137
< Process::registerExecContext(ExecContext *xc)
---
> Process::registerThreadContext(ThreadContext *tc)
140,141c140,141
< int myIndex = execContexts.size();
< execContexts.push_back(xc);
---
> int myIndex = threadContexts.size();
> threadContexts.push_back(tc);
150c150
< if (execContexts.empty())
---
> if (threadContexts.empty())
153,154c153,154
< // first exec context for this process... initialize & enable
< ExecContext *xc = execContexts[0];
---
> // first thread context for this process... initialize & enable
> ThreadContext *tc = threadContexts[0];
157c157
< xc->activate(0);
---
> tc->activate(0);
167c167
< Process::replaceExecContext(ExecContext *xc, int xcIndex)
---
> Process::replaceThreadContext(ThreadContext *tc, int tcIndex)
169,171c169,171
< if (xcIndex >= execContexts.size()) {
< panic("replaceExecContext: bad xcIndex, %d >= %d\n",
< xcIndex, execContexts.size());
---
> if (tcIndex >= threadContexts.size()) {
> panic("replaceThreadContext: bad tcIndex, %d >= %d\n",
> tcIndex, threadContexts.size());
174c174
< execContexts[xcIndex] = xc;
---
> threadContexts[tcIndex] = tc;
341,343c341,343
< execContexts[0]->setIntReg(ArgumentReg0, argc);
< execContexts[0]->setIntReg(ArgumentReg1, argv_array_base);
< execContexts[0]->setIntReg(StackPointerReg, stack_min);
---
> threadContexts[0]->setIntReg(ArgumentReg0, argc);
> threadContexts[0]->setIntReg(ArgumentReg1, argv_array_base);
> threadContexts[0]->setIntReg(StackPointerReg, stack_min);
346,348c346,348
< execContexts[0]->setPC(prog_entry);
< execContexts[0]->setNextPC(prog_entry + sizeof(MachInst));
< execContexts[0]->setNextNPC(prog_entry + (2 * sizeof(MachInst)));
---
> threadContexts[0]->setPC(prog_entry);
> threadContexts[0]->setNextPC(prog_entry + sizeof(MachInst));
> threadContexts[0]->setNextNPC(prog_entry + (2 * sizeof(MachInst)));
354c354
< LiveProcess::syscall(int64_t callnum, ExecContext *xc)
---
> LiveProcess::syscall(int64_t callnum, ThreadContext *tc)
362c362
< desc->doSyscall(callnum, this, xc);
---
> desc->doSyscall(callnum, this, tc);