diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc index a72d8509e..e9c575028 100644 --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -362,32 +362,6 @@ MessageBuffer::isReady() const (m_prio_heap.front()->getLastEnqueueTime() <= m_receiver->clockEdge())); } -bool -MessageBuffer::functionalRead(Packet *pkt) -{ - // Check the priority heap and read any messages that may - // correspond to the address in the packet. - for (unsigned int i = 0; i < m_prio_heap.size(); ++i) { - Message *msg = m_prio_heap[i].get(); - if (msg->functionalRead(pkt)) return true; - } - - // Read the messages in the stall queue that correspond - // to the address in the packet. - for (StallMsgMapType::iterator map_iter = m_stall_msg_map.begin(); - map_iter != m_stall_msg_map.end(); - ++map_iter) { - - for (std::list::iterator it = (map_iter->second).begin(); - it != (map_iter->second).end(); ++it) { - - Message *msg = (*it).get(); - if (msg->functionalRead(pkt)) return true; - } - } - return false; -} - uint32_t MessageBuffer::functionalWrite(Packet *pkt) { diff --git a/src/mem/ruby/network/MessageBuffer.hh b/src/mem/ruby/network/MessageBuffer.hh index 4209aea0f..2625acabd 100644 --- a/src/mem/ruby/network/MessageBuffer.hh +++ b/src/mem/ruby/network/MessageBuffer.hh @@ -136,11 +136,6 @@ class MessageBuffer : public SimObject void setIncomingLink(int link_id) { m_input_link_id = link_id; } void setVnet(int net) { m_vnet_id = net; } - // Function for figuring out if any of the messages in the buffer can - // satisfy the read request for the address in the packet. - // Return value, if true, indicates that the request was fulfilled. - bool functionalRead(Packet *pkt); - // Function for figuring out if any of the messages in the buffer need // to be updated with the data from the packet. // Return value indicates the number of messages that were updated. diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 5b7d7ebad..4dabb7157 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -233,12 +233,6 @@ SimpleNetwork::functionalRead(Packet *pkt) } } - for (unsigned int i = 0; i < m_int_link_buffers.size(); ++i) { - if (m_int_link_buffers[i]->functionalRead(pkt)) { - return true; - } - } - return false; } diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc index b9d0b8010..e5988e505 100644 --- a/src/mem/ruby/network/simple/Switch.cc +++ b/src/mem/ruby/network/simple/Switch.cc @@ -184,12 +184,6 @@ Switch::print(std::ostream& out) const bool Switch::functionalRead(Packet *pkt) { - // Access the buffers in the switch for performing a functional read - for (unsigned int i = 0; i < m_port_buffers.size(); ++i) { - if (m_port_buffers[i]->functionalRead(pkt)) { - return true; - } - } return false; }