ruby: removed the chip pointer from MessageBuffer

The Chip object no longer exists and thus is removed from the MessageBuffer
constructor.

diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/buffers/MessageBuffer.cc
index eaa39654748844fb0f54ffe474c4da062459c577..d157e2a94a70f8227fae590fcbd91ed395952bf8 100644 (file)
--- a/src/mem/ruby/buffers/MessageBuffer.cc
+++ b/src/mem/ruby/buffers/MessageBuffer.cc
@@ -34,8 +34,7 @@
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/system/System.hh"
 
-MessageBuffer::MessageBuffer(const Chip* chip_ptr,
-                             const string &name)
+MessageBuffer::MessageBuffer(const string &name)
 {
   m_msg_counter = 0;
   m_consumer_ptr = NULL;

diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh
index dfb66dfdf99f646357d4bf23af05dace76449d4f..8440c333571c25180ef5b4172dffae01e713664a 100644 (file)
--- a/src/mem/ruby/buffers/MessageBuffer.hh
+++ b/src/mem/ruby/buffers/MessageBuffer.hh
@@ -46,14 +46,10 @@
 #include "mem/gems_common/PrioHeap.hh"
 #include "mem/gems_common/util.hh"
 
-class Chip;
-
 class MessageBuffer {
 public:
   // Constructors
-  // The chip_ptr is ignored, but could be used for extra debugging
-  MessageBuffer(const Chip* chip_ptr = NULL,
-                const string &name = "");
+  MessageBuffer(const string &name = "");
 
   // ~MessageBuffer()
 

diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index f6a217c917499cfd265520d1ed5c620236544fd7..adf7ee21e719384b9b1fb0c99ebeacbb8bf63278 100644 (file)
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -87,9 +87,9 @@ void SimpleNetwork::init(const vector<string> & argv)
     m_toNetQueues[node].setSize(m_virtual_networks);
     m_fromNetQueues[node].setSize(m_virtual_networks);
     for (int j = 0; j < m_virtual_networks; j++) {
-      m_toNetQueues[node][j] = new MessageBuffer(NULL,
+      m_toNetQueues[node][j] = new MessageBuffer(
                    "toNet node "+int_to_string(node)+" j "+int_to_string(j));
-      m_fromNetQueues[node][j] = new MessageBuffer(NULL,
+      m_fromNetQueues[node][j] = new MessageBuffer(
                    "fromNet node "+int_to_string(node)+" j "+int_to_string(j));
     }
   }