summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorAndrew Schultz <alschult@umich.edu>2004-02-03 16:59:40 -0500
committerAndrew Schultz <alschult@umich.edu>2004-02-03 16:59:40 -0500
commitd08e1bc56999d9529915f994d86d23518fa7a36b (patch)
treeaddcc4825f6c9347c13db2ec9c063337ba4a91f4 /dev
parent8a28933c249bf7fcc2530a1e3059ced147a298d1 (diff)
downloadgem5-d08e1bc56999d9529915f994d86d23518fa7a36b.tar.xz
Fix to support redefinition of functional_memory base class
--HG-- extra : convert_revision : c06b2cfd2787022ee5dc664886873a9afa459434
Diffstat (limited to 'dev')
-rw-r--r--dev/tsunami_cchip.cc4
-rw-r--r--dev/tsunami_cchip.hh4
-rw-r--r--dev/tsunami_io.cc4
-rw-r--r--dev/tsunami_io.hh4
-rw-r--r--dev/tsunami_pchip.cc4
-rw-r--r--dev/tsunami_pchip.hh4
-rw-r--r--dev/tsunami_uart.cc4
-rw-r--r--dev/tsunami_uart.hh4
8 files changed, 16 insertions, 16 deletions
diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc
index 9bb9be13f..17b0f1c48 100644
--- 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 c1c196d18..a79e60cfc 100644
--- 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 c6447cf64..79fc4cb51 100644
--- 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 97589e5f0..9ebf61481 100644
--- 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 aadcf998f..61f126c8b 100644
--- 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 6a7f24e95..b00866e03 100644
--- 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 d2056e65b..30fbb70d6 100644
--- 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 f32b1ff4c..e5a70e9fe 100644
--- 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);