[gem5-dev] changeset in gem5: slicc: fixes for the Address to Addr changese...

[Tony Gutierrez]

changeset d5a7a4da9f63 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=d5a7a4da9f63
description:
        slicc: fixes for the Address to Addr changeset (11025)

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

diffstat:

 src/mem/protocol/RubySlicc_Util.sm             |  4 ++++
 src/mem/ruby/slicc_interface/RubySlicc_Util.hh |  7 +++++++
 src/mem/slicc/symbols/Transition.py            |  2 +-
 3 files changed, 12 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r fa3e56b6e0b6 -r d5a7a4da9f63 src/mem/protocol/RubySlicc_Util.sm
--- a/src/mem/protocol/RubySlicc_Util.sm        Fri Nov 13 17:30:56 2015 -0500
+++ b/src/mem/protocol/RubySlicc_Util.sm        Fri Nov 13 17:30:58 2015 -0500
@@ -36,6 +36,7 @@
 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 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 -r fa3e56b6e0b6 -r d5a7a4da9f63 
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh    Fri Nov 13 17:30:56 
2015 -0500
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh    Fri Nov 13 17:30:58 
2015 -0500
@@ -65,6 +65,13 @@
     return addr;
 }
 
+inline Addr
+intToAddress(int addr)
+{
+    assert(!(addr & 0xffffffff00000000));
+    return addr;
+}
+
 inline int
 mod(int val, int mod)
 {
diff -r fa3e56b6e0b6 -r d5a7a4da9f63 src/mem/slicc/symbols/Transition.py
--- a/src/mem/slicc/symbols/Transition.py       Fri Nov 13 17:30:56 2015 -0500
+++ b/src/mem/slicc/symbols/Transition.py       Fri Nov 13 17:30:58 2015 -0500
@@ -40,7 +40,7 @@
             # 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:
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev