7 files changed, 11 insertions, 15 deletions
diff --git a/base/loader/aout_object.cc b/base/loader/aout_object.cc
index c81f7123f..18a0eaa5e 100644
--- a/base/loader/aout_object.cc
+++ b/base/loader/aout_object.cc
@@ -30,7 +30,7 @@
 
 #include "base/loader/aout_object.hh"
 
-#include "mem/functional/functional.hh"
+#include "mem/memory.hh"
 #include "base/loader/symtab.hh"
 
 #include "base/trace.hh"	// for DPRINTF
@@ -78,7 +78,7 @@ AoutObject::AoutObject(const string &_filename, int _fd,
 
 
 bool
-AoutObject::loadSections(FunctionalMemory *mem, bool loadPhys)
+AoutObject::loadSections(Memory *mem, bool loadPhys)
 {
     Addr textAddr = text.baseAddr;
     Addr dataAddr = data.baseAddr;
diff --git a/base/loader/aout_object.hh b/base/loader/aout_object.hh
index 1868192b2..44061c660 100644
--- a/base/loader/aout_object.hh
+++ b/base/loader/aout_object.hh
@@ -46,8 +46,7 @@ class AoutObject : public ObjectFile
   public:
     virtual ~AoutObject() {}
 
-    virtual bool loadSections(FunctionalMemory *mem,
-                              bool loadPhys = false);
+    virtual bool loadSections(Memory *mem, bool loadPhys = false);
     virtual bool loadGlobalSymbols(SymbolTable *symtab);
     virtual bool loadLocalSymbols(SymbolTable *symtab);
 
diff --git a/base/loader/ecoff_object.cc b/base/loader/ecoff_object.cc
index 353a5f333..7df2cfa97 100644
--- a/base/loader/ecoff_object.cc
+++ b/base/loader/ecoff_object.cc
@@ -30,7 +30,7 @@
 
 #include "base/loader/ecoff_object.hh"
 
-#include "mem/functional/functional.hh"
+#include "mem/memory.hh"
 #include "base/loader/symtab.hh"
 
 #include "base/trace.hh"	// for DPRINTF
@@ -82,7 +82,7 @@ EcoffObject::EcoffObject(const string &_filename, int _fd,
 
 
 bool
-EcoffObject::loadSections(FunctionalMemory *mem, bool loadPhys)
+EcoffObject::loadSections(Memory *mem, bool loadPhys)
 {
     Addr textAddr = text.baseAddr;
     Addr dataAddr = data.baseAddr;
diff --git a/base/loader/ecoff_object.hh b/base/loader/ecoff_object.hh
index 78aa7f3f7..c39aa9a3a 100644
--- a/base/loader/ecoff_object.hh
+++ b/base/loader/ecoff_object.hh
@@ -50,8 +50,7 @@ class EcoffObject : public ObjectFile
   public:
     virtual ~EcoffObject() {}
 
-    virtual bool loadSections(FunctionalMemory *mem,
-                              bool loadPhys = false);
+    virtual bool loadSections(Memory *mem, bool loadPhys = false);
     virtual bool loadGlobalSymbols(SymbolTable *symtab);
     virtual bool loadLocalSymbols(SymbolTable *symtab);
 
diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc
index b74d537af..fcac6c7f8 100644
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -43,7 +43,7 @@
 
 #include "base/loader/elf_object.hh"
 
-#include "mem/functional/functional.hh"
+#include "mem/memory.hh"
 #include "base/loader/symtab.hh"
 
 #include "base/trace.hh"	// for DPRINTF
@@ -170,7 +170,7 @@ ElfObject::ElfObject(const string &_filename, int _fd,
 
 
 bool
-ElfObject::loadSections(FunctionalMemory *mem, bool loadPhys)
+ElfObject::loadSections(Memory *mem, bool loadPhys)
 {
     Addr textAddr = text.baseAddr;
     Addr dataAddr = data.baseAddr;
diff --git a/base/loader/elf_object.hh b/base/loader/elf_object.hh
index 66d8b3e63..324fe9535 100644
--- a/base/loader/elf_object.hh
+++ b/base/loader/elf_object.hh
@@ -48,8 +48,7 @@ class ElfObject : public ObjectFile
   public:
     virtual ~ElfObject() {}
 
-    virtual bool loadSections(FunctionalMemory *mem,
-                              bool loadPhys = false);
+    virtual bool loadSections(Memory *mem, bool loadPhys = false);
     virtual bool loadGlobalSymbols(SymbolTable *symtab);
     virtual bool loadLocalSymbols(SymbolTable *symtab);
 
diff --git a/base/loader/object_file.hh b/base/loader/object_file.hh
index 26d3ef3b0..091e5493c 100644
--- a/base/loader/object_file.hh
+++ b/base/loader/object_file.hh
@@ -31,7 +31,7 @@
 
 #include "targetarch/isa_traits.hh"	// for Addr
 
-class FunctionalMemory;
+class Memory;
 class SymbolTable;
 
 class ObjectFile
@@ -67,8 +67,7 @@ class ObjectFile
 
     void close();
 
-    virtual bool loadSections(FunctionalMemory *mem,
-                              bool loadPhys = false) = 0;
+    virtual bool loadSections(Memory *mem, bool loadPhys = false) = 0;
     virtual bool loadGlobalSymbols(SymbolTable *symtab) = 0;
     virtual bool loadLocalSymbols(SymbolTable *symtab) = 0;