From d5023847951dcebcb38838cae0a141bd1a62e407 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Tue, 11 Dec 2012 10:05:53 -0600
Subject: ruby: add functions for computing next stride/page address

---
 src/mem/ruby/common/Address.cc | 23 +++++++++++++++++++++++
 src/mem/ruby/common/Address.hh |  6 +++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index d3f678863..b075ef3c5 100644
--- a/src/mem/ruby/common/Address.cc
+++ b/src/mem/ruby/common/Address.cc
@@ -26,6 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "arch/isa_traits.hh"
+#include "config/the_isa.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/system/System.hh"
 
@@ -134,3 +136,24 @@ Address::operator=(const Address& obj)
     return *this;
 }
 
+void
+Address::makePageAddress()
+{
+    m_address = maskLowOrderBits(TheISA::LogVMPageSize);
+}
+
+Address
+page_address(const Address& addr)
+{
+    Address temp = addr;
+    temp.makePageAddress();
+    return temp;
+}
+
+Address
+next_stride_address(const Address& addr, int stride)
+{
+    Address temp = addr;
+    temp.makeNextStrideAddress(stride);
+    return temp;
+}
diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh
index ce1e76e91..c63100b7f 100644
--- a/src/mem/ruby/common/Address.hh
+++ b/src/mem/ruby/common/Address.hh
@@ -36,7 +36,7 @@
 #include "base/hashmap.hh"
 #include "mem/ruby/common/TypeDefines.hh"
 
-const int ADDRESS_WIDTH = 64; // address width in bytes
+const uint32_t ADDRESS_WIDTH = 64; // address width in bytes
 
 class Address;
 typedef Address PhysAddress;
@@ -69,6 +69,7 @@ class Address
     physical_address_t getLineAddress() const;
     physical_address_t getOffset() const;
     void makeLineAddress();
+    void makePageAddress();
     void makeNextStrideAddress(int stride);
 
     int getBankSetNum() const;
@@ -202,6 +203,9 @@ Address::shiftLowOrderBits(int number) const
     return (m_address >> number);
 }
 
+Address next_stride_address(const Address& addr, int stride);
+Address page_address(const Address& addr);
+
 __hash_namespace_begin
 template <> struct hash<Address>
 {
-- 
cgit v1.2.3