From e2b329d574483096da64d4050a9a0b228757a72e Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sun, 12 Mar 2006 17:21:59 -0500 Subject: Replace Memory with MemObject; no need for two different levels of hierarchy there. Get rid of addPort(). Change getPort() behavior on PhysicalMemory. SConscript: cpu/simple/cpu.hh: sim/system.cc: sim/system.hh: Replace Memory with MemObject. cpu/base.hh: No need to declare Port here anymore. cpu/cpu_exec_context.hh: Need PageTable definition. cpu/simple/cpu.cc: mem/physical.cc: mem/physical.hh: Replace Memory with MemObject. Get rid of addPort(); allow getting anonymous ports with getPort(). mem/translating_port.hh: Remove unneeded header. sim/process.cc: Replace Memory with MemObject. Change how initialization port gets set up to deal with change in addPort()/getPort(). Current solution is not ideal but it works. sim/process.hh: Remove unneeded headers and declarations. Make LiveProcess::getDesc() abstract instead of panicing if called. sim/syscall_emul.hh: Fix includes. --HG-- extra : convert_revision : 11d4ffb54230038afcf7219cc46e51f809329a2f --- SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SConscript') diff --git a/SConscript b/SConscript index ae7602c9d..e9957e143 100644 --- a/SConscript +++ b/SConscript @@ -88,7 +88,7 @@ base_sources = Split(''' cpu/static_inst.cc cpu/sampler/sampler.cc - mem/memory.cc + mem/mem_object.cc mem/page_table.cc mem/physical.cc mem/port.cc -- cgit v1.2.3