changeset 5a879a3513dc in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=5a879a3513dc
description:
ruby: Ruby 64-bit address output fixes.
diffstat:
4 files changed, 16 insertions(+), 2 deletions(-)
src/mem/ruby/libruby.cc | 6 ++++++
src/mem/ruby/libruby.hh | 2 ++
src/mem/ruby/system/Sequencer.cc | 8 ++++++--
src/mem/ruby/system/Sequencer.hh | 2 ++
diffs (72 lines):
diff -r a22a47e60c21 -r 5a879a3513dc src/mem/ruby/libruby.cc
--- a/src/mem/ruby/libruby.cc Wed Nov 18 13:55:57 2009 -0800
+++ b/src/mem/ruby/libruby.cc Wed Nov 18 13:55:57 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 a22a47e60c21 -r 5a879a3513dc src/mem/ruby/libruby.hh
--- a/src/mem/ruby/libruby.hh Wed Nov 18 13:55:57 2009 -0800
+++ b/src/mem/ruby/libruby.hh Wed Nov 18 13:55:57 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 a22a47e60c21 -r 5a879a3513dc src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc Wed Nov 18 13:55:57 2009 -0800
+++ b/src/mem/ruby/system/Sequencer.cc Wed Nov 18 13:55:57 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 a22a47e60c21 -r 5a879a3513dc src/mem/ruby/system/Sequencer.hh
--- a/src/mem/ruby/system/Sequencer.hh Wed Nov 18 13:55:57 2009 -0800
+++ b/src/mem/ruby/system/Sequencer.hh Wed Nov 18 13:55:57 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
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
