slicc: fixes for the Address to Addr changeset (11025)

misc changes now that Address has become Addr including int to address util
function

diff --git a/src/mem/protocol/RubySlicc_Util.sm b/src/mem/protocol/RubySlicc_Util.sm
index a179e5bbcfb712214a9a5d772e006b493cbd9864..848f8c2c927daaf0c2ad0d8e645db18f08425a42 100644 (file)
--- a/src/mem/protocol/RubySlicc_Util.sm
+++ b/src/mem/protocol/RubySlicc_Util.sm
@@ -36,6 +36,7 @@ Cycles zero_time();
 NodeID intToID(int nodenum);
 int IDToInt(NodeID id);
 int addressToInt(Addr addr);
+Addr intToAddress(int addr);
 void procProfileCoherenceRequest(NodeID node, bool needCLB);
 void dirProfileCoherenceRequest(NodeID node, bool needCLB);
 int max_tokens();
@@ -43,6 +44,9 @@ Addr setOffset(Addr addr, int offset);
 Addr makeLineAddress(Addr addr);
 int getOffset(Addr addr);
 int mod(int val, int mod);
+Addr bitSelect(Addr addr, int small, int big);
+Addr maskLowOrderBits(Addr addr, int number);
+Addr makeNextStrideAddress(Addr addr, int stride);
 structure(BoolVec, external="yes") {
 }
 int countBoolVec(BoolVec bVec);

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index 4a48d3efe9f749b28d30325017e18e00042b554b..55f229d206445239574a72e37680d62c956a3c02 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -65,6 +65,13 @@ addressToInt(Addr addr)
     return addr;
 }
 
+inline Addr
+intToAddress(int addr)
+{
+    assert(!(addr & 0xffffffff00000000));
+    return addr;
+}
+
 inline int
 mod(int val, int mod)
 {

diff --git a/src/mem/slicc/symbols/Transition.py b/src/mem/slicc/symbols/Transition.py
index 856d3f4b000d250cc0290d388ede4e22ea9e9951..8f88352c82934045afa3d5ec759f62fb15b07227 100644 (file)
--- a/src/mem/slicc/symbols/Transition.py
+++ b/src/mem/slicc/symbols/Transition.py
@@ -40,7 +40,7 @@ class Transition(Symbol):
             # check to make sure there is a getNextState function declared
             found = False
             for func in machine.functions:
-                if func.c_ident == 'getNextState_Address':
+                if func.c_ident == 'getNextState_Addr':
                     found = True
                     break
             if found == False: