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/system/RubySystem.py |  1 -
 src/mem/ruby/system/Sequencer.cc  | 32 +++++++-------------------------
 src/mem/ruby/system/System.cc     |  1 -
 3 files changed, 7 insertions(+), 27 deletions(-)

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

diff --git a/src/mem/ruby/system/RubySystem.py b/src/mem/ruby/system/RubySystem.py
index 00d02b3df..7878cec63 100644
--- a/src/mem/ruby/system/RubySystem.py
+++ b/src/mem/ruby/system/RubySystem.py
@@ -40,7 +40,6 @@ class RubySystem(SimObject):
         "default cache block size; must be a power of two");
     mem_size = Param.MemorySize("total memory size of the system");
     network = Param.RubyNetwork("")
-    debug = Param.RubyDebug("the default debug object")
     profiler = Param.RubyProfiler("");
     tracer = Param.RubyTracer("");
     stats_filename = Param.String("ruby.stats",
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 6357980f2..a82bcd2af 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -485,19 +485,10 @@ Sequencer::hitCallback(SequencerRequest* srequest,
                                                    g_eventQueue_ptr->getTime());
         }
 
-        if (Debug::getProtocolTrace()) {
-            if (success) {
-                g_system_ptr->getProfiler()->
-                    profileTransition("Seq", m_version,
-                                      Address(ruby_request.paddr), "", "Done", "",
-                                      csprintf("%d cycles", miss_latency));
-            } else {
-                g_system_ptr->getProfiler()->
-                    profileTransition("Seq", m_version,
-                                      Address(ruby_request.paddr), "", "SC_Failed", "",
-                                      csprintf("%d cycles", miss_latency));
-            }
-        }
+        DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %d cycles\n",
+            g_eventQueue_ptr->getTime(), m_version, "Seq",
+            success ? "Done" : "SC_Failed", "", "",
+            Address(ruby_request.paddr), miss_latency);
     }
 #if 0
     if (request.getPrefetch() == PrefetchBit_Yes) {
@@ -658,18 +649,9 @@ Sequencer::issueRequest(const RubyRequest& request)
         Address(request.pc), amtype, request.len, PrefetchBit_No,
         request.proc_id);
 
-    if (Debug::getProtocolTrace()) {
-        g_system_ptr->getProfiler()->
-            profileTransition("Seq", m_version, Address(request.paddr),
-                              "", "Begin", "",
-                              RubyRequestType_to_string(request.type));
-    }
-
-    if (g_system_ptr->getTracer()->traceEnabled()) {
-        g_system_ptr->getTracer()->
-            traceRequest(this, line_addr, Address(request.pc),
-                         request.type, g_eventQueue_ptr->getTime());
-    }
+    DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %s\n",
+        g_eventQueue_ptr->getTime(), m_version, "Seq", "Begin", "", "",
+        Address(request.paddr), RubyRequestType_to_string(request.type));
 
     Time latency = 0;  // initialzed to an null value
 
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index a704724ac..d9c4fa821 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -75,7 +75,6 @@ RubySystem::RubySystem(const Params *p)
     }
 
     m_network_ptr = p->network;
-    g_debug_ptr = p->debug;
     m_profiler_ptr = p->profiler;
     m_tracer_ptr = p->tracer;
 
-- 
cgit v1.2.3