44,45c44
< memoryPort(csprintf("%s.memory", name()), this, ""),
< m_responseFromMemory_ptr(new MessageBuffer())
---
> memoryPort(csprintf("%s.memory", name()), this, "")
47,53d45
< // Set the sender pointer of the response message buffer from the
< // memory controller.
< // This pointer is used for querying for the current time.
< m_responseFromMemory_ptr->setSender(this);
< m_responseFromMemory_ptr->setReceiver(this);
< m_responseFromMemory_ptr->setOrdering(false);
<
70a63,65
> if (getMemoryQueue()) {
> getMemoryQueue()->setSender(this);
> }
301,303d295
< // Check the message buffer that runs from the memory to the controller.
< num_functional_writes += m_responseFromMemory_ptr->functionalWrite(pkt);
<
316a309
> assert(getMemoryQueue());
341c334
< m_responseFromMemory_ptr->enqueue(msg);
---
> getMemoryQueue()->enqueue(msg);