Make loaders use translation port instead of proxy memory.

Also start compiling Simple CPU again.

SConscript:
    Start Compiling Simple CPU as well
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:
sim/process.cc:
sim/process.hh:
    Convert loaders to used translation port instead of proxy memory

--HG--
extra : convert_revision : 63275071f6a0e0d71935641205b203d94381ee44

diff --git a/SConscript b/SConscript
index 3e613d840b2ba257ecc08a2d327a08a76849867b..c20430d6c9b4a495524c92f3144415b3ffe64575 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -335,7 +335,7 @@ for f in targetarch_files:
 
 
 # Set up complete list of sources based on configuration.
-sources = base_sources
+sources = base_sources + simple_cpu_sources
 
 if env['FULL_SYSTEM']:
     sources += full_system_sources

diff --git a/base/loader/aout_object.cc b/base/loader/aout_object.cc
index 18a0eaa5e165a3da527450602f4e95675c3fc3bd..54bf81aafa6a6a037b0c75877b1e332d823e39aa 100644 (file)
--- a/base/loader/aout_object.cc
+++ b/base/loader/aout_object.cc
@@ -30,7 +30,7 @@
 
 #include "base/loader/aout_object.hh"
 
-#include "mem/memory.hh"
+#include "mem/translating_port.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(Memory *mem, bool loadPhys)
+AoutObject::loadSections(TranslatingPort *memPort, bool loadPhys)
 {
     Addr textAddr = text.baseAddr;
     Addr dataAddr = data.baseAddr;
@@ -91,9 +91,9 @@ AoutObject::loadSections(Memory *mem, bool loadPhys)
     // Since we don't really have an MMU and all memory is
     // zero-filled, there's no need to set up the BSS segment.
     if (text.size != 0)
-        mem->prot_write(textAddr, fileData + N_TXTOFF(*execHdr), text.size);
+        memPort->writeBlobFunctional(textAddr, fileData + N_TXTOFF(*execHdr), text.size);
     if (data.size != 0)
-        mem->prot_write(dataAddr, fileData + N_DATOFF(*execHdr), data.size);
+        memPort->writeBlobFunctional(dataAddr, fileData + N_DATOFF(*execHdr), data.size);
 
     return true;
 }

diff --git a/base/loader/aout_object.hh b/base/loader/aout_object.hh
index 44061c660bee43a2b84cea09da919f5b3afa99f8..359866dc5d19c05d972d874bfcb05ea964e0019a 100644 (file)
--- a/base/loader/aout_object.hh
+++ b/base/loader/aout_object.hh
@@ -46,7 +46,7 @@ class AoutObject : public ObjectFile
   public:
     virtual ~AoutObject() {}
 
-    virtual bool loadSections(Memory *mem, bool loadPhys = false);
+    virtual bool loadSections(TranslatingPort *memPort, 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 7df2cfa97deef9ba7620864919e3bac849f7cf81..a18ecc026cfaff070b3f53b8b641a3be1d57d9e7 100644 (file)
--- a/base/loader/ecoff_object.cc
+++ b/base/loader/ecoff_object.cc
@@ -30,7 +30,7 @@
 
 #include "base/loader/ecoff_object.hh"
 
-#include "mem/memory.hh"
+#include "mem/translating_port.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(Memory *mem, bool loadPhys)
+EcoffObject::loadSections(TranslatingPort *memPort, bool loadPhys)
 {
     Addr textAddr = text.baseAddr;
     Addr dataAddr = data.baseAddr;
@@ -94,8 +94,8 @@ EcoffObject::loadSections(Memory *mem, bool loadPhys)
 
     // Since we don't really have an MMU and all memory is
     // zero-filled, there's no need to set up the BSS segment.
-    mem->prot_write(textAddr, fileData + ECOFF_TXTOFF(execHdr), text.size);
-    mem->prot_write(dataAddr, fileData + ECOFF_DATOFF(execHdr), data.size);
+    memPort->writeBlobFunctional(textAddr, fileData + ECOFF_TXTOFF(execHdr), text.size);
+    memPort->writeBlobFunctional(dataAddr, fileData + ECOFF_DATOFF(execHdr), data.size);
 
     return true;
 }

diff --git a/base/loader/ecoff_object.hh b/base/loader/ecoff_object.hh
index c39aa9a3a68031424d2446b7ffdd141a5ca755a2..39b161bfcb30f2273cd75f344eb135a380b975fb 100644 (file)
--- a/base/loader/ecoff_object.hh
+++ b/base/loader/ecoff_object.hh
@@ -50,7 +50,7 @@ class EcoffObject : public ObjectFile
   public:
     virtual ~EcoffObject() {}
 
-    virtual bool loadSections(Memory *mem, bool loadPhys = false);
+    virtual bool loadSections(TranslatingPort *memPort, 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 fcac6c7f8911ef2b615bf87dc8d3442bb2db36f9..aeb81cb768eb5eb15838030ce808deb428fef605 100644 (file)
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -43,7 +43,7 @@
 
 #include "base/loader/elf_object.hh"
 
-#include "mem/memory.hh"
+#include "mem/translating_port.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(Memory *mem, bool loadPhys)
+ElfObject::loadSections(TranslatingPort *memPort, bool loadPhys)
 {
     Addr textAddr = text.baseAddr;
     Addr dataAddr = data.baseAddr;
@@ -183,9 +183,9 @@ ElfObject::loadSections(Memory *mem, bool loadPhys)
     // Since we don't really have an MMU and all memory is
     // zero-filled, there's no need to set up the BSS segment.
     if (text.size != 0)
-        mem->prot_write(textAddr, fileTextBits, text.size);
+        memPort->writeBlobFunctional(textAddr, fileTextBits, text.size);
     if (data.size != 0)
-        mem->prot_write(dataAddr, fileDataBits, data.size);
+        memPort->writeBlobFunctional(dataAddr, fileDataBits, data.size);
 
     return true;
 }

diff --git a/base/loader/elf_object.hh b/base/loader/elf_object.hh
index 324fe953596f9de868ceeeeee3594ef7d6f96151..3e93c30b73d6f89b5311aa509f67f98b0a5ab676 100644 (file)
--- a/base/loader/elf_object.hh
+++ b/base/loader/elf_object.hh
@@ -48,7 +48,7 @@ class ElfObject : public ObjectFile
   public:
     virtual ~ElfObject() {}
 
-    virtual bool loadSections(Memory *mem, bool loadPhys = false);
+    virtual bool loadSections(TranslatingPort *memPort, 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 091e5493c4ab4fe677dff3cd04e8413cda0fd5b4..1d750e34115f1b819427355431b8b9ff902dcd31 100644 (file)
--- a/base/loader/object_file.hh
+++ b/base/loader/object_file.hh
@@ -31,7 +31,7 @@
 
 #include "targetarch/isa_traits.hh"    // for Addr
 
-class Memory;
+class TranslatingPort;
 class SymbolTable;
 
 class ObjectFile
@@ -67,7 +67,7 @@ class ObjectFile
 
     void close();
 
-    virtual bool loadSections(Memory *mem, bool loadPhys = false) = 0;
+    virtual bool loadSections(TranslatingPort *memPort, bool loadPhys = false) = 0;
     virtual bool loadGlobalSymbols(SymbolTable *symtab) = 0;
     virtual bool loadLocalSymbols(SymbolTable *symtab) = 0;
 

diff --git a/sim/process.cc b/sim/process.cc
index 2355fdc192b263eeacc621f604a4e4ec704c2341..013ac0890b2f3b1c7583b05f73c86c3997ce3998 100644 (file)
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -43,7 +43,7 @@
 #include "encumbered/eio/eio.hh"
 #include "mem/page_table.hh"
 #include "mem/memory.hh"
-#include "mem/proxy.hh"
+#include "mem/translating_port.hh"
 #include "sim/builder.hh"
 #include "sim/fake_syscall.hh"
 #include "sim/process.hh"
@@ -154,7 +154,7 @@ Process::startup()
     if (execContexts.empty())
         fatal("Process %s is not associated with any CPUs!\n", name());
 
-    initVirtMem = new ProxyMemory(system->physmem, pTable);
+    initVirtMem = new TranslatingPort(system->physmem->getPort("any"), pTable);
 
     // first exec context for this process... initialize & enable
     ExecContext *xc = execContexts[0];
@@ -245,18 +245,18 @@ DEFINE_SIM_OBJECT_CLASS_NAME("Process", Process)
 
 static void
 copyStringArray(vector<string> &strings, Addr array_ptr, Addr data_ptr,
-                Memory *func)
+                TranslatingPort* memPort)
 {
     for (int i = 0; i < strings.size(); ++i) {
-        func->prot_write(array_ptr, (uint8_t*)&data_ptr, sizeof(Addr));
-        func->writeStringFunctional(data_ptr, strings[i].c_str());
+        memPort->writeBlobFunctional(array_ptr, (uint8_t*)&data_ptr, sizeof(Addr));
+        memPort->writeStringFunctional(data_ptr, strings[i].c_str());
         array_ptr += sizeof(Addr);
         data_ptr += strings[i].size() + 1;
     }
     // add NULL terminator
     data_ptr = 0;
 
-    func->prot_write(array_ptr, (uint8_t*)&data_ptr, sizeof(Addr));
+    memPort->writeBlobFunctional(array_ptr, (uint8_t*)&data_ptr, sizeof(Addr));
 }
 
 LiveProcess::LiveProcess(const string &nm, ObjectFile *_objFile,
@@ -273,7 +273,7 @@ LiveProcess::LiveProcess(const string &nm, ObjectFile *_objFile,
     text_size = objFile->textSize();
     data_base = objFile->dataBase();
     data_size = objFile->dataSize() + objFile->bssSize();
-    brk_point = = roundUp(data_base + data_size, VMPageSize);
+    brk_point = roundUp(data_base + data_size, VMPageSize);
 
     // Set up stack.  On Alpha, stack goes below text section.  This
     // code should get moved to some architecture-specific spot.
@@ -341,7 +341,7 @@ LiveProcess::startup()
 
     // write contents to stack
     uint64_t argc = argv.size();
-    initVirtMem->prot_write(stack_min, (uint8_t*)&argc, sizeof(uint64_t));
+    initVirtMem->writeBlobFunctional(stack_min, (uint8_t*)&argc, sizeof(uint64_t));
 
     copyStringArray(argv, argv_array_base, arg_data_base, initVirtMem);
     copyStringArray(envp, envp_array_base, env_data_base, initVirtMem);

diff --git a/sim/process.hh b/sim/process.hh
index cdd28982d8ef307b83ba826b61a7a5fbefdf34a8..8d8c9e676b0a7ca70f53ca61e0cd8195a8564fdb 100644 (file)
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -50,7 +50,7 @@
 #include "targetarch/isa_traits.hh"
 
 class ExecContext;
-class Memory;
+class TranslatingPort;
 class System;
 
 class Process : public SimObject
@@ -128,7 +128,7 @@ class Process : public SimObject
 
   protected:
     /// Memory object for initialization (image loading)
-    Memory *initVirtMem;
+    TranslatingPort *initVirtMem;
 
   public:
     PageTable *pTable;