Fix to support redefinition of functional_memory base class

--HG--
extra : convert_revision : c06b2cfd2787022ee5dc664886873a9afa459434
This commit is contained in:
Andrew Schultz 2004-02-03 16:59:40 -05:00
parent 8a28933c24
commit d08e1bc569
8 changed files with 16 additions and 16 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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;

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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;

View file

@ -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);