summaryrefslogtreecommitdiff
path: root/mem/physical.cc
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2006-02-15 14:21:09 -0500
committerRon Dreslinski <rdreslin@umich.edu>2006-02-15 14:21:09 -0500
commit7f114ca41930c7e0a71dfb105472671cfa25ddec (patch)
treed2d696e7633a347bb5ca2824720caed578f62fe2 /mem/physical.cc
parent3298e937d389c2fa0a5e5a8eeb1db2a3fac3e7e3 (diff)
downloadgem5-7f114ca41930c7e0a71dfb105472671cfa25ddec.tar.xz
Many changes that make the new mem system compile. Now to convert the rest of the tree to use the new mem system.
mem/mem_object.hh: Create constrtor so it compiles mem/packet.hh: Fix typedefs so they compile, add in a few more headers for compilation mem/page_table.cc: convert to new mem system so it compiles mem/page_table.hh: fix it to the version that had asid support. Make it compile in the new system mem/physical.cc: Fix some compilation bugs mem/physical.hh: Add a type that made compile fail mem/port.hh: Fix a spelling error that messed up compilation mem/request.hh: fix typedefs and forward declerations so it compiles --HG-- extra : convert_revision : 580fb1ba31ada799ff0122601b8b5a8d994bb8af
Diffstat (limited to 'mem/physical.cc')
-rw-r--r--mem/physical.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/mem/physical.cc b/mem/physical.cc
index c45e12750..02563ac70 100644
--- a/mem/physical.cc
+++ b/mem/physical.cc
@@ -43,11 +43,12 @@
#if FULL_SYSTEM
#include "mem/functional/memory_control.hh"
#endif
-#include "mem/functional/physical.hh"
+#include "mem/physical.hh"
#include "sim/host.hh"
#include "sim/builder.hh"
#include "targetarch/isa_traits.hh"
+
using namespace std;
#if FULL_SYSTEM
@@ -89,7 +90,7 @@ PhysicalMemory::PhysicalMemory(const string &n, Range<Addr> range,
#endif
PhysicalMemory::PhysicalMemory(const string &n)
- : FunctionalMemory(n), base_addr(0), pmem_addr(NULL)
+ : Memory(n), base_addr(0), pmem_addr(NULL)
{
// Hardcoded to 128 MB for now.
pmem_size = 1 << 27;