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.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/mem/ruby/structures/PersistentTable.hh b/src/mem/ruby/structures/PersistentTable.hh
index 7e10b328c..a4604fce8 100644
--- a/src/mem/ruby/structures/PersistentTable.hh
+++ b/src/mem/ruby/structures/PersistentTable.hh
@@ -58,16 +58,16 @@ class PersistentTable
     ~PersistentTable();
 
     // Public Methods
-    void persistentRequestLock(const Address& address, MachineID locker,
+    void persistentRequestLock(Addr address, MachineID locker,
                                AccessType type);
-    void persistentRequestUnlock(const Address& address, MachineID unlocker);
-    bool okToIssueStarving(const Address& address, MachineID machID) const;
-    MachineID findSmallest(const Address& address) const;
-    AccessType typeOfSmallest(const Address& address) const;
-    void markEntries(const Address& address);
-    bool isLocked(const Address& addr) const;
-    int countStarvingForAddress(const Address& addr) const;
-    int countReadStarvingForAddress(const Address& addr) const;
+    void persistentRequestUnlock(Addr address, MachineID unlocker);
+    bool okToIssueStarving(Addr address, MachineID machID) const;
+    MachineID findSmallest(Addr address) const;
+    AccessType typeOfSmallest(Addr address) const;
+    void markEntries(Addr address);
+    bool isLocked(Addr addr) const;
+    int countStarvingForAddress(Addr addr) const;
+    int countReadStarvingForAddress(Addr addr) const;
 
     void print(std::ostream& out) const;
 
@@ -77,7 +77,7 @@ class PersistentTable
     PersistentTable& operator=(const PersistentTable& obj);
 
     // Data Members (m_prefix)
-    typedef m5::hash_map<Address, PersistentTableEntry> AddressMap;
+    typedef m5::hash_map<Addr, PersistentTableEntry> AddressMap;
     AddressMap m_map;
 };