diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/cpu_exec_context.cc | 4 | ||||
| -rw-r--r-- | cpu/cpu_exec_context.hh | 4 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpu/cpu_exec_context.cc b/cpu/cpu_exec_context.cc index f6edf4b13..a3e6cc432 100644 --- a/cpu/cpu_exec_context.cc +++ b/cpu/cpu_exec_context.cc @@ -80,7 +80,7 @@ CPUExecContext::CPUExecContext(BaseCPU *_cpu, int _thread_num, System *_sys, } #else CPUExecContext::CPUExecContext(BaseCPU *_cpu, int _thread_num, - Process *_process, int _asid) + Process *_process, int _asid, MemObject* memobj) : _status(ExecContext::Unallocated), cpu(_cpu), thread_num(_thread_num), cpu_id(-1), lastActivate(0), lastSuspend(0), process(_process), asid(_asid), @@ -89,7 +89,7 @@ CPUExecContext::CPUExecContext(BaseCPU *_cpu, int _thread_num, /* Use this port to for syscall emulation writes to memory. */ Port *mem_port; port = new TranslatingPort(process->pTable, false); - mem_port = process->system->physmem->getPort("functional"); + mem_port = memobj->getPort("functional"); mem_port->setPeer(port); port->setPeer(mem_port); diff --git a/cpu/cpu_exec_context.hh b/cpu/cpu_exec_context.hh index 9bf548a45..7ceb7f2d8 100644 --- a/cpu/cpu_exec_context.hh +++ b/cpu/cpu_exec_context.hh @@ -205,8 +205,8 @@ class CPUExecContext CPUExecContext(BaseCPU *_cpu, int _thread_num, System *_system, AlphaITB *_itb, AlphaDTB *_dtb); #else - CPUExecContext(BaseCPU *_cpu, int _thread_num, Process *_process, - int _asid); + CPUExecContext(BaseCPU *_cpu, int _thread_num, Process *_process, int _asid, + MemObject *memobj); // Constructor to use XC to pass reg file around. Not used for anything // else. CPUExecContext(RegFile *regFile); diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index b7cfc4f16..049606036 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -169,7 +169,7 @@ SimpleCPU::SimpleCPU(Params *p) cpuXC = new CPUExecContext(this, 0, p->system, p->itb, p->dtb); #else cpuXC = new CPUExecContext(this, /* thread_num */ 0, p->process, - /* asid */ 0); + /* asid */ 0, mem); #endif // !FULL_SYSTEM xcProxy = cpuXC->getProxy(); |