[gem5-dev] changeset in gem5: ruby: slicc: remove variable 'addr' used in c...

[Nilay Vaish]

changeset 8523754f8885 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=8523754f8885
description:
        ruby: slicc: remove variable 'addr' used in calls to doTransition
        This variable causes trouble if a variable of same name is declared in a
        protocol file. Hence it is being eliminated.

diffstat:

 src/mem/slicc/ast/FuncCallExprAST.py |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 5176f0a71e56 -r 8523754f8885 src/mem/slicc/ast/FuncCallExprAST.py
--- a/src/mem/slicc/ast/FuncCallExprAST.py      Sat Jan 04 00:03:34 2014 -0600
+++ b/src/mem/slicc/ast/FuncCallExprAST.py      Wed Jan 08 04:26:25 2014 -0600
@@ -93,7 +93,8 @@
         for expr,expected_type in zip(self.exprs, func.param_types):
             # Check the types of the parameter
             actual_type,param_code = expr.inline(True)
-            if str(actual_type) != str(expected_type):
+            if str(actual_type) != 'OOD' and \
+            str(actual_type) != str(expected_type):
                 expr.error("Type mismatch: expected: %s actual: %s" % \
                            (expected_type, actual_type))
             cvec.append(param_code)
@@ -116,23 +117,22 @@
         if self.proc_name == "trigger":
             code('''
 {
-    Address addr = ${{cvec[1]}};
 ''')
             if machine.TBEType != None and machine.EntryType != None:
                 code('''
-    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[2]}}, 
${{cvec[3]}}, addr);
+    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[2]}}, 
${{cvec[3]}}, ${{cvec[1]}});
 ''')
             elif machine.TBEType != None:
                 code('''
-    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[2]}}, addr);
+    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[2]}}, 
${{cvec[1]}});
 ''')
             elif machine.EntryType != None:
                 code('''
-    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[2]}}, addr);
+    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[2]}}, 
${{cvec[1]}});
 ''')
             else:
                 code('''
-    TransitionResult result = doTransition(${{cvec[0]}}, addr);
+    TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[1]}});
 ''')
 
             code('''
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev