ruby: restrict Address to being a type and not a variable name

Change all occurrances of Address as a variable name to instead use Addr.
Address is an allowed name in slicc even when Address is also being used as a
type, leading to declarations of "Address Address". While this works, it
prevents adding another field of type Address because the compiler then thinks
Address is a variable name, not type.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/mem/protocol/MOESI_CMP_directory-msg.sm b/src/mem/protocol/MOESI_CMP_directory-msg.sm
index e428be7f7..6452aa9f9 100644
--- a/src/mem/protocol/MOESI_CMP_directory-msg.sm
+++ b/src/mem/protocol/MOESI_CMP_directory-msg.sm
@@ -69,7 +69,7 @@ enumeration(TriggerType, desc="...") {
 
 // TriggerMsg
 structure(TriggerMsg, desc="...", interface="Message") {
-  Address Address,             desc="Physical address for this request";
+  Address Addr,             desc="Physical address for this request";
   TriggerType Type,            desc="Type of trigger";
 
   bool functionalRead(Packet *pkt) {
@@ -85,7 +85,7 @@ structure(TriggerMsg, desc="...", interface="Message") {
 
 // RequestMsg (and also forwarded requests)
 structure(RequestMsg, desc="...", interface="NetworkMessage") {
-  Address Address,             desc="Physical address for this request";
+  Address Addr,             desc="Physical address for this request";
   int Len,                     desc="Length of Request";
   CoherenceRequestType Type,   desc="Type of request (GetS, GetX, PutX, etc)";
   MachineID Requestor,            desc="Node who initiated the request";
@@ -101,20 +101,20 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") {
     // Read only those messages that contain the data
     if (Type == CoherenceRequestType:DMA_READ ||
         Type == CoherenceRequestType:DMA_WRITE) {
-        return testAndRead(Address, DataBlk, pkt);
+        return testAndRead(Addr, DataBlk, pkt);
     }
     return false;
   }
 
   bool functionalWrite(Packet *pkt) {
     // No check required since all messages are written
-    return testAndWrite(Address, DataBlk, pkt);
+    return testAndWrite(Addr, DataBlk, pkt);
   }
 }
 
 // ResponseMsg (and also unblock requests)
 structure(ResponseMsg, desc="...", interface="NetworkMessage") {
-  Address Address,             desc="Physical address for this request";
+  Address Addr,             desc="Physical address for this request";
   CoherenceResponseType Type,  desc="Type of response (Ack, Data, etc)";
   MachineID Sender,               desc="Node who sent the data";
   MachineType SenderMachine,   desc="type of component sending msg";
@@ -130,13 +130,13 @@ structure(ResponseMsg, desc="...", interface="NetworkMessage") {
         Type == CoherenceResponseType:DATA_EXCLUSIVE ||
         Type == CoherenceResponseType:WRITEBACK_CLEAN_DATA ||
         Type == CoherenceResponseType:WRITEBACK_DIRTY_DATA) {
-        return testAndRead(Address, DataBlk, pkt);
+        return testAndRead(Addr, DataBlk, pkt);
     }
     return false;
   }
 
   bool functionalWrite(Packet *pkt) {
     // No check required since all messages are written
-    return testAndWrite(Address, DataBlk, pkt);
+    return testAndWrite(Addr, DataBlk, pkt);
   }
 }