353a354
> # Prototype the actions that the controller can take
361c362,364
< code('void ${{action.ident}}(${{self.TBEType.c_ident}}*& m_tbe_ptr, ${{self.EntryType.c_ident}}*& m_cache_entry_ptr, const Address& addr);')
---
> code('void ${{action.ident}}(${{self.TBEType.c_ident}}*& '
> 'm_tbe_ptr, ${{self.EntryType.c_ident}}*& '
> 'm_cache_entry_ptr, const Address& addr);')
365c368,369
< code('void ${{action.ident}}(${{self.TBEType.c_ident}}*& m_tbe_ptr, const Address& addr);')
---
> code('void ${{action.ident}}(${{self.TBEType.c_ident}}*& '
> 'm_tbe_ptr, const Address& addr);')
369c373,374
< code('void ${{action.ident}}(${{self.EntryType.c_ident}}*& m_cache_entry_ptr, const Address& addr);')
---
> code('void ${{action.ident}}(${{self.EntryType.c_ident}}*& '
> 'm_cache_entry_ptr, const Address& addr);')
436a442,443
> num_in_ports = len(self.in_ports)
>
462a470,472
> m_num_controllers++;
>
> m_in_ports = $num_in_ports;
464,465d473
< num_in_ports = len(self.in_ports)
< code(' m_in_ports = $num_in_ports;')
470,472c478,479
< # this machines config parameters. Also detemine if these configuration
< # params include a sequencer. This information will be used later for
< # contecting the sequencer back to the L1 cache controller.
---
> # this machines config parameters. Also if these configuration params
> # include a sequencer, connect the it to the controller.
474,475d480
< contains_dma_sequencer = False
< sequencers = []
477,480d481
< if param.name == "dma_sequencer":
< contains_dma_sequencer = True
< elif re.compile("sequencer").search(param.name):
< sequencers.append(param.name)
485,506c486,487
<
< #
< # For the l1 cache controller, add the special atomic support which
< # includes passing the sequencer a pointer to the controller.
< #
< 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_dma_sequencer:
< self.error("The DMA controller must include the sequencer " \
< "configuration parameter")
<
< code('''
< m_dma_sequencer_ptr->setController(this);
< ''')
---
> if re.compile("sequencer").search(param.name):
> code('m_${{param.name}}_ptr->setController(this);')
508d488
< code('m_num_controllers++;')
695c675
< has_mandatory_q = False
---
> mq_ident = "NULL"
698c678
< has_mandatory_q = True
---
> mq_ident = "m_%s_mandatoryQueue_ptr" % self.ident
700,704d679
< if has_mandatory_q:
< mq_ident = "m_%s_mandatoryQueue_ptr" % self.ident
< else:
< mq_ident = "NULL"
<