summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2015-09-14 10:04:55 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2015-09-14 10:04:55 -0500
commit4e898be76299f72605fd1624f04917edb2bba3c4 (patch)
tree15d8351f9ae0ebd0756cf9fefd079b0d71cd681b
parent78bf2dfeac083f5f945ce61cf8ec32374e7c94ae (diff)
downloadgem5-4e898be76299f72605fd1624f04917edb2bba3c4.tar.xz
ruby: slicc: remove member buffer_expr from Var class
This was added by changeset 51f40b101a56. Instead, buffer_expr would now be associated with the InPort class.
-rw-r--r--src/mem/slicc/ast/InPortDeclAST.py3
-rw-r--r--src/mem/slicc/symbols/StateMachine.py2
-rw-r--r--src/mem/slicc/symbols/Var.py3
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/slicc/ast/InPortDeclAST.py b/src/mem/slicc/ast/InPortDeclAST.py
index 7a019a0e0..e0aa25236 100644
--- a/src/mem/slicc/ast/InPortDeclAST.py
+++ b/src/mem/slicc/ast/InPortDeclAST.py
@@ -58,8 +58,9 @@ class InPortDeclAST(DeclAST):
queue_type)
type = self.queue_type.type
+ self.pairs["buffer_expr"] = self.var_expr
in_port = Var(self.symtab, self.ident, self.location, type, str(code),
- self.pairs, machine, self.var_expr)
+ self.pairs, machine)
symtab.newSymbol(in_port)
symtab.pushFrame()
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index 3e6a93fa7..b5d9c2afe 100644
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -196,7 +196,7 @@ class StateMachine(Symbol):
port_to_buf_map = {}
in_msg_bufs = {}
for port in self.in_ports:
- buf_name = "m_%s_ptr" % port.buffer_expr.name
+ buf_name = "m_%s_ptr" % port.pairs["buffer_expr"].name
msg_bufs.append(buf_name)
port_to_buf_map[port] = msg_bufs.index(buf_name)
if buf_name not in in_msg_bufs:
diff --git a/src/mem/slicc/symbols/Var.py b/src/mem/slicc/symbols/Var.py
index 85b9e67cd..2a4ef23db 100644
--- a/src/mem/slicc/symbols/Var.py
+++ b/src/mem/slicc/symbols/Var.py
@@ -29,10 +29,9 @@ from slicc.symbols.Symbol import Symbol
class Var(Symbol):
def __init__(self, symtab, ident, location, type, code, pairs,
- machine=None, buffer_expr=""):
+ machine=None):
super(Var, self).__init__(symtab, ident, location, pairs)
- self.buffer_expr = buffer_expr
self.machine = machine
self.type = type
self.code = code