summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mem/ruby/system/RubyPort.cc14
-rw-r--r--src/mem/tport.cc10
2 files changed, 6 insertions, 18 deletions
diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc
index 1ebc1b0f6..72dc1447a 100644
--- a/src/mem/ruby/system/RubyPort.cc
+++ b/src/mem/ruby/system/RubyPort.cc
@@ -168,18 +168,8 @@ RubyPort::M5Port::recvTimingReq(PacketPtr pkt)
//dsm: based on SimpleTimingPort::recvTimingReq(pkt);
- // The received packets should only be M5 requests, which should never
- // get nacked. There used to be code to hanldle nacks here, but
- // I'm pretty sure it didn't work correctly with the drain code,
- // so that would need to be fixed if we ever added it back.
-
- if (pkt->memInhibitAsserted()) {
- warn("memInhibitAsserted???");
- // snooper will supply based on copy of packet
- // still target's responsibility to delete packet
- delete pkt;
- return true;
- }
+ if (pkt->memInhibitAsserted())
+ panic("RubyPort should never see an inhibited request\n");
// Save the port in the sender state object to be used later to
// route the response
diff --git a/src/mem/tport.cc b/src/mem/tport.cc
index 7a0dd7cd9..4408b59ba 100644
--- a/src/mem/tport.cc
+++ b/src/mem/tport.cc
@@ -68,12 +68,10 @@ SimpleTimingPort::recvTimingReq(PacketPtr pkt)
delete pendingDelete[x];
pendingDelete.clear();
- if (pkt->memInhibitAsserted()) {
- // snooper will supply based on copy of packet
- // still target's responsibility to delete packet
- delete pkt;
- return true;
- }
+ // the SimpleTimingPort should not be used anywhere where there is
+ // a need to deal with inhibited packets
+ if (pkt->memInhibitAsserted())
+ panic("SimpleTimingPort should never see an inhibited request\n");
bool needsResponse = pkt->needsResponse();
Tick latency = recvAtomic(pkt);