sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: slicc: remove variable 'addr' used in calls to doTransition

Browse source 
This variable causes trouble if a variable of same name is declared in a
protocol file. Hence it is being eliminated.
This commit is contained in:
Nilay Vaish 2014-01-08 04:26:25 -06:00
parent 4070b00875
commit 8559081648
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mem/slicc/ast/FuncCallExprAST.py
View file

@ -93,7 +93,8 @@ class FuncCallExprAST(ExprAST):
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 @@ class FuncCallExprAST(ExprAST):
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('''