summaryrefslogtreecommitdiff
path: root/src/mem/protocol/RubySlicc_MemControl.sm
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2015-08-14 12:04:47 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2015-08-14 12:04:47 -0500
commit9ea5d9cad9381e05004de28ef25309ebe94c3a79 (patch)
tree9e984df6ec20f479ea4c21fd29d1186052ef9ac0 /src/mem/protocol/RubySlicc_MemControl.sm
parent93c173a95e985d6b1fd413a9cfb5a3f8839135c0 (diff)
downloadgem5-9ea5d9cad9381e05004de28ef25309ebe94c3a79.tar.xz
ruby: rename variables Addr to addr
Avoid clash between type Addr and variable name Addr.
Diffstat (limited to 'src/mem/protocol/RubySlicc_MemControl.sm')
-rw-r--r--src/mem/protocol/RubySlicc_MemControl.sm6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/protocol/RubySlicc_MemControl.sm b/src/mem/protocol/RubySlicc_MemControl.sm
index 21f73828c..e71e80dc4 100644
--- a/src/mem/protocol/RubySlicc_MemControl.sm
+++ b/src/mem/protocol/RubySlicc_MemControl.sm
@@ -51,7 +51,7 @@ enumeration(MemoryRequestType, desc="...") {
// Message to and from Memory Control
structure(MemoryMsg, desc="...", interface="Message") {
- Address Addr, desc="Physical address for this request";
+ Address addr, desc="Physical address for this request";
MemoryRequestType Type, desc="Type of memory request (MEMORY_READ or MEMORY_WB)";
MachineID Sender, desc="What component sent the data";
MachineID OriginalRequestorMachId, desc="What component originally requested";
@@ -63,10 +63,10 @@ structure(MemoryMsg, desc="...", interface="Message") {
int Acks, desc="How many acks to expect";
bool functionalRead(Packet *pkt) {
- return testAndRead(Addr, DataBlk, pkt);
+ return testAndRead(addr, DataBlk, pkt);
}
bool functionalWrite(Packet *pkt) {
- return testAndWrite(Addr, DataBlk, pkt);
+ return testAndWrite(addr, DataBlk, pkt);
}
}