7 files changed, 19 insertions, 20 deletions

diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index 80800e862..e48678bbb 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -414,7 +414,7 @@ ElfObject::loadLocalSymbols(SymbolTable *symtab, Addr addrMask)
 }
 
 bool
-ElfObject::loadSections(PortProxy* memProxy, Addr addrMask)
+ElfObject::loadSections(PortProxy& memProxy, Addr addrMask)
 {
     if (!ObjectFile::loadSections(memProxy, addrMask))
         return false;
diff --git a/src/base/loader/elf_object.hh b/src/base/loader/elf_object.hh
index afb61c21d..350a80db1 100644
--- a/src/base/loader/elf_object.hh
+++ b/src/base/loader/elf_object.hh
@@ -65,7 +65,7 @@ class ElfObject : public ObjectFile
   public:
     virtual ~ElfObject() {}
 
-    bool loadSections(PortProxy *memProxy,
+    bool loadSections(PortProxy& memProxy,
             Addr addrMask = std::numeric_limits<Addr>::max());
     virtual bool loadGlobalSymbols(SymbolTable *symtab, Addr addrMask =
             std::numeric_limits<Addr>::max());
diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc
index d38c0fb62..bfebc1b44 100755
--- a/src/base/loader/hex_file.cc
+++ b/src/base/loader/hex_file.cc
@@ -59,7 +59,7 @@ HexFile::~HexFile()
 }
 
 bool
-HexFile::loadSections(PortProxy* memProxy)
+HexFile::loadSections(PortProxy& memProxy)
 {
     char Line[64];
     Addr MemAddr;
@@ -71,7 +71,7 @@ HexFile::loadSections(PortProxy* memProxy)
         parseLine(Line, &MemAddr, &Data);
         if (MemAddr != 0) {
             // Now, write to memory
-            memProxy->writeBlob(MemAddr << 2, (uint8_t *)&Data, sizeof(Data));
+            memProxy.writeBlob(MemAddr << 2, (uint8_t *)&Data, sizeof(Data));
         }
     }
     return true;
diff --git a/src/base/loader/hex_file.hh b/src/base/loader/hex_file.hh
index 514a02a1e..fe34fddf0 100755
--- a/src/base/loader/hex_file.hh
+++ b/src/base/loader/hex_file.hh
@@ -52,7 +52,7 @@ class HexFile
     virtual ~HexFile();
 
     void close();
-    bool loadSections(PortProxy* memProxy);
+    bool loadSections(PortProxy& memProxy);
 };
 
 #endif // __BASE_LOADER_HEX_FILE_HH__
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index eaf0443bf..420611d83 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -65,16 +65,16 @@ ObjectFile::~ObjectFile()
 
 
 bool
-ObjectFile::loadSection(Section *sec, PortProxy* memProxy, Addr addrMask)
+ObjectFile::loadSection(Section *sec, PortProxy& memProxy, Addr addrMask)
 {
     if (sec->size != 0) {
         Addr addr = sec->baseAddr & addrMask;
         if (sec->fileImage) {
-            memProxy->writeBlob(addr, sec->fileImage, sec->size);
+            memProxy.writeBlob(addr, sec->fileImage, sec->size);
         }
         else {
             // no image: must be bss
-            memProxy->memsetBlob(addr, 0, sec->size);
+            memProxy.memsetBlob(addr, 0, sec->size);
         }
     }
     return true;
@@ -82,7 +82,7 @@ ObjectFile::loadSection(Section *sec, PortProxy* memProxy, Addr addrMask)
 
 
 bool
-ObjectFile::loadSections(PortProxy* memProxy, Addr addrMask)
+ObjectFile::loadSections(PortProxy& memProxy, Addr addrMask)
 {
     return (loadSection(&text, memProxy, addrMask)
             && loadSection(&data, memProxy, addrMask)
diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index ce58a2c4f..2ec41bf12 100644
--- a/src/base/loader/object_file.hh
+++ b/src/base/loader/object_file.hh
@@ -83,7 +83,7 @@ class ObjectFile
 
     void close();
 
-    virtual bool loadSections(PortProxy *memProxy, Addr addrMask =
+    virtual bool loadSections(PortProxy& memProxy, Addr addrMask =
             std::numeric_limits<Addr>::max());
     virtual bool loadGlobalSymbols(SymbolTable *symtab, Addr addrMask =
             std::numeric_limits<Addr>::max()) = 0;
@@ -111,7 +111,7 @@ class ObjectFile
     Section data;
     Section bss;
 
-    bool loadSection(Section *sec, PortProxy* memProxy, Addr addrMask);
+    bool loadSection(Section *sec, PortProxy& memProxy, Addr addrMask);
     void setGlobalPointer(Addr global_ptr) { globalPtr = global_ptr; }
 
   public:
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index 7b38753e2..98e943084 100644
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -461,11 +461,11 @@ BaseRemoteGDB::read(Addr vaddr, size_t size, char *data)
     DPRINTF(GDBRead, "read:  addr=%#x, size=%d", vaddr, size);
 
     if (FullSystem) {
-        FSTranslatingPortProxy *port = context->getVirtProxy();
-        port->readBlob(vaddr, (uint8_t*)data, size);
+        FSTranslatingPortProxy &proxy = context->getVirtProxy();
+        proxy.readBlob(vaddr, (uint8_t*)data, size);
     } else {
-        SETranslatingPortProxy *port = context->getMemProxy();
-        port->readBlob(vaddr, (uint8_t*)data, size);
+        SETranslatingPortProxy &proxy = context->getMemProxy();
+        proxy.readBlob(vaddr, (uint8_t*)data, size);
     }
 
 #if TRACING_ON
@@ -504,12 +504,11 @@ BaseRemoteGDB::write(Addr vaddr, size_t size, const char *data)
             DPRINTFNR("\n");
     }
     if (FullSystem) {
-        FSTranslatingPortProxy *port = context->getVirtProxy();
-        port->writeBlob(vaddr, (uint8_t*)data, size);
+        FSTranslatingPortProxy &proxy = context->getVirtProxy();
+        proxy.writeBlob(vaddr, (uint8_t*)data, size);
     } else {
-        SETranslatingPortProxy *port = context->getMemProxy();
-        port->writeBlob(vaddr, (uint8_t*)data, size);
-        delete port;
+        SETranslatingPortProxy &proxy = context->getMemProxy();
+        proxy.writeBlob(vaddr, (uint8_t*)data, size);
     }
 
     return true;