Fix to support redefinition of functional_memory base class

--HG--
extra : convert_revision : c06b2cfd2787022ee5dc664886873a9afa459434

diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc
index 9bb9be13f3f33eec3e27056acb2d4e6e8bf86825..17b0f1c48bfe1b96006b81e31c4d5b179e79aad5 100644 (file)
--- a/dev/tsunami_cchip.cc
+++ b/dev/tsunami_cchip.cc
@@ -40,7 +40,7 @@ TsunamiCChip::TsunamiCChip(const string &name, Tsunami *t,
 }
 
 Fault
-TsunamiCChip::read(MemReqPtr req, uint8_t *data)
+TsunamiCChip::read(MemReqPtr &req, uint8_t *data)
 {
     DPRINTF(Tsunami, "read  va=%#x size=%d\n",
             req->vaddr, req->size);
@@ -126,7 +126,7 @@ TsunamiCChip::read(MemReqPtr req, uint8_t *data)
 }
 
 Fault
-TsunamiCChip::write(MemReqPtr req, const uint8_t *data)
+TsunamiCChip::write(MemReqPtr &req, const uint8_t *data)
 {
     DPRINTF(Tsunami, "write - va=%#x size=%d \n",
             req->vaddr, req->size);

diff --git a/dev/tsunami_cchip.hh b/dev/tsunami_cchip.hh
index c1c196d184687be245555d68d03e6e42363356c6..a79e60cfcf1ffad622bb2c631877855207d16b29 100644 (file)
--- a/dev/tsunami_cchip.hh
+++ b/dev/tsunami_cchip.hh
@@ -54,8 +54,8 @@ class TsunamiCChip : public MmapDevice
     TsunamiCChip(const std::string &name, Tsunami *t,
                Addr addr, Addr mask, MemoryController *mmu);
 
-    virtual Fault read(MemReqPtr req, uint8_t *data);
-    virtual Fault write(MemReqPtr req, const uint8_t *data);
+    virtual Fault read(MemReqPtr &req, uint8_t *data);
+    virtual Fault write(MemReqPtr &req, const uint8_t *data);
 
     void postDRIR(uint64_t bitvector);
     void clearDRIR(uint64_t bitvector);

diff --git a/dev/tsunami_io.cc b/dev/tsunami_io.cc
index c6447cf644b57590746aa54dd0a5b2b3bb583a43..79fc4cb510610557d26488af3cadbb8f2a745276 100644 (file)
--- a/dev/tsunami_io.cc
+++ b/dev/tsunami_io.cc
@@ -121,7 +121,7 @@ TsunamiIO::set_time(time_t t)
 }
 
 Fault
-TsunamiIO::read(MemReqPtr req, uint8_t *data)
+TsunamiIO::read(MemReqPtr &req, uint8_t *data)
 {
     DPRINTF(Tsunami, "io read  va=%#x size=%d IOPorrt=%#x\n",
             req->vaddr, req->size, req->vaddr & 0xfff);
@@ -192,7 +192,7 @@ TsunamiIO::read(MemReqPtr req, uint8_t *data)
 }
 
 Fault
-TsunamiIO::write(MemReqPtr req, const uint8_t *data)
+TsunamiIO::write(MemReqPtr &req, const uint8_t *data)
 {
     uint8_t dt = *(uint8_t*)data;
     uint64_t dt64 = dt;

diff --git a/dev/tsunami_io.hh b/dev/tsunami_io.hh
index 97589e5f060512589ee72ea38e096489ec32f959..9ebf61481ee1ccd2679cbff4a16be68453316934 100644 (file)
--- a/dev/tsunami_io.hh
+++ b/dev/tsunami_io.hh
@@ -121,8 +121,8 @@ class TsunamiIO : public MmapDevice
 
     void set_time(time_t t);
 
-    virtual Fault read(MemReqPtr req, uint8_t *data);
-    virtual Fault write(MemReqPtr req, const uint8_t *data);
+    virtual Fault read(MemReqPtr &req, uint8_t *data);
+    virtual Fault write(MemReqPtr &req, const uint8_t *data);
 
     void postPIC(uint8_t bitvector);
     void clearPIC(uint8_t bitvector);

diff --git a/dev/tsunami_pchip.cc b/dev/tsunami_pchip.cc
index aadcf998ff3ef339327216e3a6dae44e097a6b16..61f126c8b602345c29e7e1aa98fd44f86de3c975 100644 (file)
--- a/dev/tsunami_pchip.cc
+++ b/dev/tsunami_pchip.cc
@@ -45,7 +45,7 @@ TsunamiPChip::TsunamiPChip(const string &name, Tsunami *t,
 }
 
 Fault
-TsunamiPChip::read(MemReqPtr req, uint8_t *data)
+TsunamiPChip::read(MemReqPtr &req, uint8_t *data)
 {
     DPRINTF(Tsunami, "read  va=%#x size=%d\n",
             req->vaddr, req->size);
@@ -135,7 +135,7 @@ TsunamiPChip::read(MemReqPtr req, uint8_t *data)
 }
 
 Fault
-TsunamiPChip::write(MemReqPtr req, const uint8_t *data)
+TsunamiPChip::write(MemReqPtr &req, const uint8_t *data)
 {
     DPRINTF(Tsunami, "write - va=%#x size=%d \n",
             req->vaddr, req->size);

diff --git a/dev/tsunami_pchip.hh b/dev/tsunami_pchip.hh
index 6a7f24e95339724b6b2374bd0fa6013195d524e6..b00866e0323ac33c57e0a2f26673bdb004b8dc01 100644 (file)
--- a/dev/tsunami_pchip.hh
+++ b/dev/tsunami_pchip.hh
@@ -64,8 +64,8 @@ class TsunamiPChip : public MmapDevice
     TsunamiPChip(const std::string &name, Tsunami *t,
                Addr addr, Addr mask, MemoryController *mmu);
 
-    virtual Fault read(MemReqPtr req, uint8_t *data);
-    virtual Fault write(MemReqPtr req, const uint8_t *data);
+    virtual Fault read(MemReqPtr &req, uint8_t *data);
+    virtual Fault write(MemReqPtr &req, const uint8_t *data);
 
     virtual void serialize(std::ostream &os);
     virtual void unserialize(Checkpoint *cp, const std::string &section);

diff --git a/dev/tsunami_uart.cc b/dev/tsunami_uart.cc
index d2056e65b861d1e027ec78e2a63a5a7419d147e3..30fbb70d671196b69ba93231c9fa78430d13391d 100644 (file)
--- a/dev/tsunami_uart.cc
+++ b/dev/tsunami_uart.cc
@@ -39,7 +39,7 @@ TsunamiUart::TsunamiUart(const string &name, SimConsole *c,
 }
 
 Fault
-TsunamiUart::read(MemReqPtr req, uint8_t *data)
+TsunamiUart::read(MemReqPtr &req, uint8_t *data)
 {
     Addr daddr = req->paddr & addr_mask;
     DPRINTF(TsunamiUart, " read register %#x\n", daddr);
@@ -116,7 +116,7 @@ TsunamiUart::read(MemReqPtr req, uint8_t *data)
 }
 
 Fault
-TsunamiUart::write(MemReqPtr req, const uint8_t *data)
+TsunamiUart::write(MemReqPtr &req, const uint8_t *data)
 {
     Addr daddr = req->paddr & addr_mask;
 

diff --git a/dev/tsunami_uart.hh b/dev/tsunami_uart.hh
index f32b1ff4c11bbc375bb94dd9f143d56583dba258..e5a70e9fece3faf45007c84136d653ba12eff0fa 100644 (file)
--- a/dev/tsunami_uart.hh
+++ b/dev/tsunami_uart.hh
@@ -52,8 +52,8 @@ class TsunamiUart : public MmapDevice
     TsunamiUart(const std::string &name, SimConsole *c,
                Addr addr, Addr mask, MemoryController *mmu);
 
-    Fault read(MemReqPtr req, uint8_t *data);
-    Fault write(MemReqPtr req, const uint8_t *data);
+    Fault read(MemReqPtr &req, uint8_t *data);
+    Fault write(MemReqPtr &req, const uint8_t *data);
 
 
     virtual void serialize(std::ostream &os);