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

Ruby: enable multiple sequencers in one controller.

Browse source
This commit is contained in:
Lisa Hsu 2011-03-31 17:17:49 -07:00
parent 225e67f531
commit c9621cc69b
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mem/slicc/symbols/StateMachine.py
View file

@ -30,6 +30,7 @@ from m5.util import orderdict
from slicc.symbols.Symbol import Symbol from slicc.symbols.Symbol import Symbol
from slicc.symbols.Var import Var from slicc.symbols.Var import Var
import slicc.generate.html as html import slicc.generate.html as html
import re
python_class_map = {"int": "Int", python_class_map = {"int": "Int",
"std::string": "String", "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 # params include a sequencer. This information will be used later for
# contecting the sequencer back to the L1 cache controller. # contecting the sequencer back to the L1 cache controller.
# #
contains_sequencer = False contains_dma_sequencer = False
sequencers = []
for param in self.config_parameters: for param in self.config_parameters:
if param.name == "sequencer" or param.name == "dma_sequencer": if param.name == "dma_sequencer":
contains_sequencer = True contains_dma_sequencer = True
elif re.compile("sequencer").search(param.name):
sequencers.append(param.name)
if param.pointer: if param.pointer:
code('m_${{param.name}}_ptr = p->${{param.name}};') code('m_${{param.name}}_ptr = p->${{param.name}};')
else: else:
@ -487,19 +491,20 @@ $c_ident::$c_ident(const Params *p)
# includes passing the sequencer a pointer to the controller. # includes passing the sequencer a pointer to the controller.
# #
if self.ident == "L1Cache": if self.ident == "L1Cache":
if not contains_sequencer: if not sequencers:
self.error("The L1Cache controller must include the sequencer " \ self.error("The L1Cache controller must include the sequencer " \
"configuration parameter") "configuration parameter")
code(''' for seq in sequencers:
m_sequencer_ptr->setController(this); code('''
''') m_${{seq}}_ptr->setController(this);
''')
# #
# For the DMA controller, pass the sequencer a pointer to the # For the DMA controller, pass the sequencer a pointer to the
# controller. # controller.
# #
if self.ident == "DMA": if self.ident == "DMA":
if not contains_sequencer: if not contains_dma_sequencer:
self.error("The DMA controller must include the sequencer " \ self.error("The DMA controller must include the sequencer " \
"configuration parameter") "configuration parameter")