summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <Lisa.Hsu@amd.com>2011-03-31 17:17:49 -0700
committerLisa Hsu <Lisa.Hsu@amd.com>2011-03-31 17:17:49 -0700
commitc9621cc69b63e881ded95aca4a260462565e3544 (patch)
tree1a2bfc2f16fbb165132d6b22f8c9929675475452
parent225e67f5310f44cc8390c77dbb2c939c58c6b46e (diff)
downloadgem5-c9621cc69b63e881ded95aca4a260462565e3544.tar.xz
Ruby: enable multiple sequencers in one controller.
-rw-r--r--src/mem/slicc/symbols/StateMachine.py21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index e66dcd7dc..71b786616 100644
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -30,6 +30,7 @@ from m5.util import orderdict
from slicc.symbols.Symbol import Symbol
from slicc.symbols.Var import Var
import slicc.generate.html as html
+import re
python_class_map = {"int": "Int",
"std::string": "String",
@@ -473,10 +474,13 @@ $c_ident::$c_ident(const Params *p)
# params include a sequencer. This information will be used later for
# contecting the sequencer back to the L1 cache controller.
#
- contains_sequencer = False
+ contains_dma_sequencer = False
+ sequencers = []
for param in self.config_parameters:
- if param.name == "sequencer" or param.name == "dma_sequencer":
- contains_sequencer = True
+ if param.name == "dma_sequencer":
+ contains_dma_sequencer = True
+ elif re.compile("sequencer").search(param.name):
+ sequencers.append(param.name)
if param.pointer:
code('m_${{param.name}}_ptr = p->${{param.name}};')
else:
@@ -487,19 +491,20 @@ $c_ident::$c_ident(const Params *p)
# includes passing the sequencer a pointer to the controller.
#
if self.ident == "L1Cache":
- if not contains_sequencer:
+ if not sequencers:
self.error("The L1Cache controller must include the sequencer " \
"configuration parameter")
- code('''
-m_sequencer_ptr->setController(this);
-''')
+ for seq in sequencers:
+ code('''
+m_${{seq}}_ptr->setController(this);
+ ''')
#
# For the DMA controller, pass the sequencer a pointer to the
# controller.
#
if self.ident == "DMA":
- if not contains_sequencer:
+ if not contains_dma_sequencer:
self.error("The DMA controller must include the sequencer " \
"configuration parameter")