[m5-dev] FW: [PATCH 04 of 31] ruby: Ruby 64-bit address output fixes

[Beckmann, Brad]

-----Original Message-----
From: g...@cmdmail.amd.com [mailto:g...@cmdmail.amd.com] 
Sent: Monday, November 09, 2009 10:32 AM
To: Beckmann, Brad
Subject: [PATCH 04 of 31] ruby: Ruby 64-bit address output fixes

# HG changeset patch
# User Brad Beckmann <brad.beckm...@amd.com>
# Date 1257791382 28800
# Node ID c5fab2b2f227a77faa7adfadfbab9d4b6b9f2515
# Parent  a4db36f36c5f4ef621806128f1a1431746be46be
ruby: Ruby 64-bit address output fixes.

diff -r a4db36f36c5f -r c5fab2b2f227 src/mem/ruby/libruby.cc
--- a/src/mem/ruby/libruby.cc   Mon Nov 09 10:29:42 2009 -0800
+++ b/src/mem/ruby/libruby.cc   Mon Nov 09 10:29:42 2009 -0800
@@ -66,6 +66,12 @@
   return out;
 }
 
+ostream& operator<<(std::ostream& out, const RubyRequest& obj)
+{
+  out << hex << "0x" << obj.paddr << flush;
+  return out;
+}
+
 vector<string> tokenizeString(string str, string delims)
 {
   vector<string> tokens;
diff -r a4db36f36c5f -r c5fab2b2f227 src/mem/ruby/libruby.hh
--- a/src/mem/ruby/libruby.hh   Mon Nov 09 10:29:42 2009 -0800
+++ b/src/mem/ruby/libruby.hh   Mon Nov 09 10:29:42 2009 -0800
@@ -39,6 +39,8 @@
   {}
 };
 
+std::ostream& operator<<(std::ostream& out, const RubyRequest& obj);
+
 /**
  * Initialize the system.  cfg_file is a Ruby-lang configuration script
  */
diff -r a4db36f36c5f -r c5fab2b2f227 src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc  Mon Nov 09 10:29:42 2009 -0800
+++ b/src/mem/ruby/system/Sequencer.cc  Mon Nov 09 10:29:42 2009 -0800
@@ -44,6 +44,10 @@
 //Sequencer::Sequencer(int core_id, MessageBuffer* mandatory_q)
 
 #define LLSC_FAIL -2
+ostream& operator<<(std::ostream& out, const SequencerRequest& obj) {
+  out << obj.ruby_request << flush;
+  return out;
+}
 
 Sequencer::Sequencer(const string & name)
   :RubyPort(name)
@@ -106,7 +110,7 @@
     SequencerRequest* request = m_readRequestTable.lookup(keys[i]);
     if (current_time - request->issue_time >= m_deadlock_threshold) {
       WARN_MSG("Possible Deadlock detected");
-      WARN_EXPR(request);
+      WARN_EXPR(request->ruby_request);
       WARN_EXPR(m_version);
       WARN_EXPR(keys.size());
       WARN_EXPR(current_time);
@@ -121,7 +125,7 @@
     SequencerRequest* request = m_writeRequestTable.lookup(keys[i]);
     if (current_time - request->issue_time >= m_deadlock_threshold) {
       WARN_MSG("Possible Deadlock detected");
-      WARN_EXPR(request);
+      WARN_EXPR(request->ruby_request);
       WARN_EXPR(m_version);
       WARN_EXPR(current_time);
       WARN_EXPR(request->issue_time);
diff -r a4db36f36c5f -r c5fab2b2f227 src/mem/ruby/system/Sequencer.hh
--- a/src/mem/ruby/system/Sequencer.hh  Mon Nov 09 10:29:42 2009 -0800
+++ b/src/mem/ruby/system/Sequencer.hh  Mon Nov 09 10:29:42 2009 -0800
@@ -63,6 +63,8 @@
   {}
 };
 
+std::ostream& operator<<(std::ostream& out, const SequencerRequest&
obj);
+
 class Sequencer : public Consumer, public RubyPort {
 public:
   // Constructors

_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev