From bd18ac82877072a87745aaf7a104e7bb036c6c66 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 10 Jan 2011 11:11:20 -0800
Subject: ruby: get rid of ruby's Debug.hh

Get rid of the Debug class
Get rid of ASSERT and use assert
Use DPRINTFR for ProtocolTrace
---
 src/mem/ruby/buffers/MessageBuffer.cc | 4 +++-
 src/mem/ruby/buffers/MessageBuffer.hh | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mem/ruby/buffers')

diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/buffers/MessageBuffer.cc
index b6d755b58..656787795 100644
--- a/src/mem/ruby/buffers/MessageBuffer.cc
+++ b/src/mem/ruby/buffers/MessageBuffer.cc
@@ -26,6 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>
+
 #include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/stl_helpers.hh"
@@ -158,7 +160,7 @@ MessageBuffer::enqueue(MsgPtr message, Time delta)
     }
     m_msgs_this_cycle++;
 
-    //  ASSERT(m_max_size == -1 || m_size <= m_max_size + 1);
+    //  assert(m_max_size == -1 || m_size <= m_max_size + 1);
     // the plus one is a kluge because of a SLICC issue
 
     if (!m_ordering_set) {
diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh
index e09abeb7d..df04d810c 100644
--- a/src/mem/ruby/buffers/MessageBuffer.hh
+++ b/src/mem/ruby/buffers/MessageBuffer.hh
@@ -35,6 +35,7 @@
 #define __MEM_RUBY_BUFFERS_MESSAGEBUFFER_HH__
 
 #include <algorithm>
+#include <cassert>
 #include <functional>
 #include <iostream>
 #include <vector>
@@ -85,7 +86,7 @@ class MessageBuffer
     void setPriority(int rank) { m_priority_rank = rank; }
     void setConsumer(Consumer* consumer_ptr)
     {
-        ASSERT(m_consumer_ptr == NULL);
+        assert(m_consumer_ptr == NULL);
         m_consumer_ptr = consumer_ptr;
     }
 
-- 
cgit v1.2.3