summaryrefslogtreecommitdiff
path: root/cpu/exec_context.cc
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2006-02-15 22:05:23 -0500
committerRon Dreslinski <rdreslin@umich.edu>2006-02-15 22:05:23 -0500
commitd142788172ee79e6e67fc8510940c884807305ad (patch)
treed1c665421357acae6f17cedc4168789f1913f6b1 /cpu/exec_context.cc
parentb8a2d1e5c78eac41125a0be0bc2b5d5fe4714684 (diff)
downloadgem5-d142788172ee79e6e67fc8510940c884807305ad.tar.xz
More compilation fixes.
Should we add a proxy_port that does the v->p address translation? Should the proxy port return a fault on translation errors, if we add one? arch/alpha/alpha_linux_process.cc: Syscalls use a memPort through the CPU now instead of a xc functional memory. cpu/base.hh: Add a pointer to the memPort syscalls will use. Should this be a proxy_port that does address translation? cpu/exec_context.cc: cpu/exec_context.hh: Remove functional memory from the exec context cpu/simple/cpu.cc: Set the memPort to be used as the syscall port as the dcache port sim/syscall_emul.cc: sim/syscall_emul.hh: Syscalls use a memPort through the CPU now instead of a xc functional memory. Also, fix the fact that readStringFunctional doesn't return a fault... should proxy_port handle this because it is doing the translation? --HG-- extra : convert_revision : 1f65318c6594301a75dc4dc0c99fdd436b094a7f
Diffstat (limited to 'cpu/exec_context.cc')
-rw-r--r--cpu/exec_context.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index edab25d0b..a281609f4 100644
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -80,7 +80,7 @@ ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, System *_system,
Memory *_mem, Process *_process, int _asid)
: _status(ExecContext::Unallocated),
cpu(_cpu), thread_num(_thread_num), cpu_id(-1),
- system(_system), mem(_mem),
+ system(_system),
process(_process),
asid(_asid),
func_exe_inst(0), storeCondFailures(0)
@@ -109,7 +109,7 @@ void
ExecContext::takeOverFrom(ExecContext *oldContext)
{
// some things should already be set up
- assert(mem == oldContext->mem);
+// assert(mem == oldContext->mem);
#if FULL_SYSTEM
assert(system == oldContext->system);
#else