projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ruby: guard usage of GPUCoalescer code in Profiler
[gem5.git]
/
src
/
mem
/
mport.cc
diff --git
a/src/mem/mport.cc
b/src/mem/mport.cc
index 2c57030b1b9cd0d0821c538be7f0dd88d067fdb4..5678f87d79b2b7ce034147010901192073cb9f63 100644
(file)
--- a/
src/mem/mport.cc
+++ b/
src/mem/mport.cc
@@
-43,17
+43,12
@@
#include "mem/mport.hh"
Tick
#include "mem/mport.hh"
Tick
-MessagePort::recvAtomic(PacketPtr pkt)
+Message
Slave
Port::recvAtomic(PacketPtr pkt)
{
if (pkt->cmd == MemCmd::MessageReq) {
return recvMessage(pkt);
{
if (pkt->cmd == MemCmd::MessageReq) {
return recvMessage(pkt);
- } else if (pkt->cmd == MemCmd::MessageResp) {
- // normally we would never see responses in recvAtomic, but
- // since the timing port uses recvAtomic to implement
- // recvTiming we have to deal with both cases
- return recvResponse(pkt);
} else {
panic("%s received unexpected atomic command %s from %s.\n",
} else {
panic("%s received unexpected atomic command %s from %s.\n",
- name(), pkt->cmd.toString(), get
Peer()->
name());
+ name(), pkt->cmd.toString(), get
MasterPort().
name());
}
}
}
}