diff options
Diffstat (limited to 'mem')
-rw-r--r-- | mem/physical.cc | 30 | ||||
-rw-r--r-- | mem/physical.hh | 15 | ||||
-rw-r--r-- | mem/port.cc | 8 |
3 files changed, 45 insertions, 8 deletions
diff --git a/mem/physical.cc b/mem/physical.cc index beebb65c8..58c9ea408 100644 --- a/mem/physical.cc +++ b/mem/physical.cc @@ -46,11 +46,31 @@ #include "mem/physical.hh" #include "sim/host.hh" #include "sim/builder.hh" +#include "sim/eventq.hh" #include "targetarch/isa_traits.hh" using namespace std; +PhysicalMemory::MemResponseEvent::MemResponseEvent(Packet &pkt, MemoryPort* _m) + : Event(&mainEventQueue, CPU_Tick_Pri), pkt(pkt), memoryPort(_m) +{ + + this->setFlags(AutoDelete); +} + +void +PhysicalMemory::MemResponseEvent::process() +{ + memoryPort->sendTiming(pkt); +} + +const char * +PhysicalMemory::MemResponseEvent::description() +{ + return "Physical Memory Timing Access respnse event"; +} + #if FULL_SYSTEM PhysicalMemory::PhysicalMemory(const string &n, Range<Addr> range, MemoryController *mmu, const std::string &fname) @@ -157,7 +177,10 @@ bool PhysicalMemory::doTimingAccess (Packet &pkt) { doFunctionalAccess(pkt); - //Schedule a response event at curTick + lat; + + MemResponseEvent* response = new MemResponseEvent(pkt, &memoryPort); + response->schedule(curTick + lat); + return true; } @@ -213,6 +236,11 @@ PhysicalMemory::MemoryPort::getDeviceAddressRanges(AddrRangeList &range_list, panic("??"); } +int +PhysicalMemory::MemoryPort::deviceBlockSize() +{ + return memory->deviceBlockSize(); +} bool PhysicalMemory::MemoryPort::recvTiming(Packet &pkt) diff --git a/mem/physical.hh b/mem/physical.hh index bac7e3d46..b31e45ac5 100644 --- a/mem/physical.hh +++ b/mem/physical.hh @@ -35,6 +35,8 @@ #include "base/range.hh" #include "mem/memory.hh" #include "mem/packet.hh" +#include "mem/port.hh" +#include "sim/eventq.hh" // // Functional model for a contiguous block of physical memory. (i.e. RAM) @@ -63,7 +65,6 @@ class PhysicalMemory : public Memory bool &owner); virtual int deviceBlockSize(); - }; MemoryPort memoryPort; @@ -72,7 +73,15 @@ class PhysicalMemory : public Memory int lat; - //event to send response needs to be here + struct MemResponseEvent : public Event + { + Packet pkt; + MemoryPort *memoryPort; + + MemResponseEvent(Packet &pkt, MemoryPort *memoryPort); + void process(); + const char *description(); + }; private: // prevent copying of a MainMemory object @@ -98,7 +107,7 @@ class PhysicalMemory : public Memory void prot_access_error(Addr addr, int size, Command func); public: - virtual int deviceBlockSize(); + int deviceBlockSize(); void prot_memset(Addr addr, uint8_t val, int size); diff --git a/mem/port.cc b/mem/port.cc index 640b72a0e..8c4b3810c 100644 --- a/mem/port.cc +++ b/mem/port.cc @@ -36,15 +36,15 @@ void Port::blobHelper(Addr addr, uint8_t *p, int size, Command cmd) { - Request rqst; + Request req; Packet pkt; - pkt.req = &rqst; + pkt.req = &req; pkt.cmd = cmd; for (ChunkGenerator gen(addr, size, peerBlockSize()); !gen.done(); gen.next()) { - pkt.addr = rqst.paddr = gen.addr(); - pkt.size = rqst.size = gen.size(); + pkt.addr = req.paddr = gen.addr(); + pkt.size = req.size = gen.size(); pkt.data = p; sendFunctional(pkt); p += gen.size(); |