From 91a84c5b3cfb888794ac0245c066a4724b9a0871 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Fri, 14 Aug 2015 12:04:51 -0500
Subject: ruby: replace Address by Addr This patch eliminates the type Address
 defined by the ruby memory system. This memory system would now use the type
 Addr that is in use by the rest of the system.

---
 src/mem/ruby/network/MessageBuffer.cc | 6 +++---
 src/mem/ruby/network/MessageBuffer.hh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc
index e9bbd0059..a72d8509e 100644
--- a/src/mem/ruby/network/MessageBuffer.cc
+++ b/src/mem/ruby/network/MessageBuffer.cc
@@ -289,7 +289,7 @@ MessageBuffer::reanalyzeList(list<MsgPtr> &lt, Tick schdTick)
 }
 
 void
-MessageBuffer::reanalyzeMessages(const Address& addr)
+MessageBuffer::reanalyzeMessages(Addr addr)
 {
     DPRINTF(RubyQueue, "ReanalyzeMessages %s\n", addr);
     assert(m_stall_msg_map.count(addr) > 0);
@@ -325,11 +325,11 @@ MessageBuffer::reanalyzeAllMessages()
 }
 
 void
-MessageBuffer::stallMessage(const Address& addr)
+MessageBuffer::stallMessage(Addr addr)
 {
     DPRINTF(RubyQueue, "Stalling due to %s\n", addr);
     assert(isReady());
-    assert(addr.getOffset() == 0);
+    assert(getOffset(addr) == 0);
     MsgPtr message = m_prio_heap.front();
 
     dequeue();
diff --git a/src/mem/ruby/network/MessageBuffer.hh b/src/mem/ruby/network/MessageBuffer.hh
index d47284eb1..732b7ec6c 100644
--- a/src/mem/ruby/network/MessageBuffer.hh
+++ b/src/mem/ruby/network/MessageBuffer.hh
@@ -55,9 +55,9 @@ class MessageBuffer : public SimObject
     typedef MessageBufferParams Params;
     MessageBuffer(const Params *p);
 
-    void reanalyzeMessages(const Address& addr);
+    void reanalyzeMessages(Addr addr);
     void reanalyzeAllMessages();
-    void stallMessage(const Address& addr);
+    void stallMessage(Addr addr);
 
     // TRUE if head of queue timestamp <= SystemTime
     bool isReady() const;
@@ -165,7 +165,7 @@ class MessageBuffer : public SimObject
 
     // use a std::map for the stalled messages as this container is
     // sorted and ensures a well-defined iteration order
-    typedef std::map< Address, std::list<MsgPtr> > StallMsgMapType;
+    typedef std::map<Addr, std::list<MsgPtr> > StallMsgMapType;
 
     StallMsgMapType m_stall_msg_map;
 
-- 
cgit v1.2.3