refactor Miranda to use new interface for accessing

CustomRequest/Response data
sstsimulator · Jan 9, 2024 · d414eec · d414eec
1 parent 04711df
commit d414eec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/sst/elements/memHierarchy/standardInterface.cc b/src/sst/elements/memHierarchy/standardInterface.cc
@@ -525,7 +525,7 @@ Event* StandardInterface::MemEventConverter::convert(StandardMem::MoveData* req)
     return move;
 }
 Event* StandardInterface::MemEventConverter::convert(StandardMem::CustomReq* req) {
-    CustomMemEvent* creq = new CustomMemEvent(iface->getName(), Command::CustomReq, req->getData());
+    CustomMemEvent* creq = new CustomMemEvent(iface->getName(), Command::CustomReq, req->releaseData());
     if (!req->needsResponse())
         creq->setFlag(MemEventBase::F_NORESPONSE);
 

diff --git a/src/sst/elements/miranda/mirandaCPU.cc b/src/sst/elements/miranda/mirandaCPU.cc
@@ -263,6 +263,9 @@ void RequestGenCPU::StdMemHandler::handle(Interfaces::StandardMem::WriteResp* rs
 
 void RequestGenCPU::StdMemHandler::handle(Interfaces::StandardMem::CustomResp* rsp) {
     cpu->requestsPending[CUSTOM]--;
+    // The CustomResp destructor does not delete the data
+    // Do not need to delete the cpuReq data as the memory system should take care of that
+    delete rsp->releaseData();
 }
 
 void RequestGenCPU::issueCustomRequest(CustomOpRequest* req) {