diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-02-15 17:52:49 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-02-15 17:52:49 -0500 |
commit | b8a2d1e5c78eac41125a0be0bc2b5d5fe4714684 (patch) | |
tree | 5d9fbf42459bc67d17cbfeaf36cda53a0068d308 /sim/system.hh | |
parent | 091e6b72cf9f6c81b44d1d871c34907ad2615e6c (diff) | |
download | gem5-b8a2d1e5c78eac41125a0be0bc2b5d5fe4714684.tar.xz |
More progress toward compiling... partly by
fixing things, partly by ignoring CPU models
that don't currently compile.
SConscript:
Split sources for fast, simple, and o3 CPU models into
separate source lists. For now none of these are included
in the base source list, so you won't get any CPU models
at all... but we still can't compile the other stuff so
it's not an issue.
Also get rid of obsolete encumbered/mem file.
base/loader/aout_object.cc:
base/loader/aout_object.hh:
base/loader/ecoff_object.cc:
base/loader/ecoff_object.hh:
base/loader/elf_object.cc:
base/loader/elf_object.hh:
base/loader/object_file.hh:
cpu/exec_context.cc:
sim/process.cc:
sim/system.cc:
sim/system.hh:
FunctionalMemory -> Memory
cpu/pc_event.hh:
Get rid of unused badpc.
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
Move Port functions into .cc file.
mem/port.hh:
Make recvAddressRangesQuery panic by default instead
of being abstract... do CPUs need to implement this?
mem/request.hh:
Add prefetch flags.
sim/syscall_emul.hh:
Start to fix...
--HG--
extra : convert_revision : ece53b3855f20916caaa381598ac37e8c7adfba7
Diffstat (limited to 'sim/system.hh')
-rw-r--r-- | sim/system.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sim/system.hh b/sim/system.hh index 6602f8582..8922373cc 100644 --- a/sim/system.hh +++ b/sim/system.hh @@ -44,7 +44,7 @@ class BaseCPU; class ExecContext; class MemoryController; class ObjectFile; -class PhysicalMemory; +class Memory; #if FULL_SYSTEM class Platform; @@ -56,7 +56,7 @@ namespace Kernel { class Binning; } class System : public SimObject { public: - PhysicalMemory *physmem; + Memory *physmem; PCEventQueue pcEventQueue; std::vector<ExecContext *> execContexts; @@ -176,7 +176,7 @@ class System : public SimObject struct Params { std::string name; - PhysicalMemory *physmem; + Memory *physmem; #if FULL_SYSTEM Tick boot_cpu_frequency; |