Ignore:
Timestamp:
Jan 31, 2008, 6:46:41 PM (16 years ago)
Author:
rosiere
Message:

Update all component (except front_end) to :

  • new statistics model
  • no namespace std
Location:
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit
Files:
3 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/include/Execute_queue.h

    r74 r75  
    137137   
    138138    // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    139   private   : queue<execute_queue_entry_t *> * _queue;
     139  private   : std::queue<execute_queue_entry_t *> * _queue;
    140140    // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    141141  private   : Tcontrol_t                       internal_EXECUTE_QUEUE_IN_ACK ;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_allocation.cpp

    r73 r75  
    2424  void Execute_queue::allocation (void)
    2525  {
    26     string rename;
    27 
    2826    log_printf(FUNC,Execute_queue,FUNCTION,"Begin");
    2927
    … …  
    9896    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    9997
    100      _queue = new queue<execute_queue_entry_t *>;
     98     _queue = new std::queue<execute_queue_entry_t *>;
    10199
    102100#ifdef POSITION

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_statistics_declaration.cpp

    r73 r75  
    2525    log_printf(FUNC,Execute_queue,FUNCTION,"Begin");
    2626
    27     _stat = new Stat (static_cast<string>(_name),
     27    _stat = new Stat (static_cast<std::string>(_name),
    2828                      "Execute_queue",
    2929                      param_statistics);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/include/Write_queue.h

    r74 r75  
    179179
    180180    // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    181   protected : list<write_queue_entry_t *> * _queue;
     181  protected : std::list<write_queue_entry_t *> * _queue;
    182182
    183183    // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp

    r74 r75  
    2323  void Write_queue::allocation (void)
    2424  {
    25     string rename;
    26 
    2725    log_printf(FUNC,Write_queue,FUNCTION,"Begin");
    2826
    … …  
    139137    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    140138
    141   _queue = new list<write_queue_entry_t *>;
     139     _queue = new std::list<write_queue_entry_t *>;
    142140
    143141#ifdef POSITION

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_genMoore.cpp

    r73 r75  
    8686    // -----[ Interface "bypass_write" ]----------------------------------
    8787    {
    88       list<write_queue_entry_t *>::iterator it = _queue->begin();
     88      std::list<write_queue_entry_t *>::iterator it = _queue->begin();
    8989      for (uint32_t i=0; i<_param->_nb_bypass_write; i++)
    9090        {

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_statistics_declaration.cpp

    r73 r75  
    2525    log_printf(FUNC,Write_queue,FUNCTION,"Begin");
    2626
    27     _stat = new Stat (static_cast<string>(_name),
     27    _stat = new Stat (static_cast<std::string>(_name),
    2828                      "Write_queue",
    2929                      param_statistics);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_allocation.cpp

    r74 r75  
    145145    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    146146
    147      string name;
     147     std::string name;
    148148
    149149     {
    … …  
    184184     {
    185185       name = _name+"_write_queue";
    186        cout << "Instance : " << name << endl;
     186       std::cout << "Instance : " << name << std::endl;
    187187       
    188188#ifdef POSITION
    … …  
    196196
    197197#ifdef POSITION
    198        _component->interface_map (name ,"WRITE_QUEUE_IN",
    199                                   _name,"WRITE_UNIT_IN");
     198       _component->interface_map (name ,"write_queue_in",
     199                                  _name,"write_unit_in");
    200200#endif
    201201
    … …  
    226226         {
    227227#ifdef POSITION
    228            _component->interface_map (name ,"WRITE_QUEUE_OUT",
    229                                       _name+"_execute_queue", "EXECUTE_QUEUE_IN");
     228           _component->interface_map (name ,"write_queue_out",
     229                                      _name+"_execute_queue", "execute_queue_in");
    230230#endif
    231231
    … …  
    250250         {
    251251#ifdef POSITION
    252            _component->interface_map (name ,"WRITE_QUEUE_OUT",
    253                                       _name,"WRITE_UNIT_OUT");
     252           _component->interface_map (name ,"write_queue_out",
     253                                      _name,"write_unit_out");
    254254#endif
    255255
    … …  
    275275         {
    276276#ifdef POSITION
    277            _component->interface_map (name ,"GPR_WRITE_"+toString(i),
    278                                       _name,"GPR_WRITE_"+toString(i));
     277           _component->interface_map (name ,"gpr_write_"+toString(i),
     278                                      _name,"gpr_write_"+toString(i));
    279279#endif     
    280280           
    … …  
    290290         {
    291291#ifdef POSITION
    292            _component->interface_map (name ,"SPR_WRITE_"+toString(i),
    293                                       _name,"SPR_WRITE_"+toString(i));
     292           _component->interface_map (name ,"spr_write_"+toString(i),
     293                                      _name,"spr_write_"+toString(i));
    294294#endif     
    295295           
    … …  
    306306         {
    307307#ifdef POSITION
    308            _component->interface_map (name ,"BYPASS_WRITE_"+toString(i),
    309                                       _name,"BYPASS_WRITE_"+toString(i));
     308           _component->interface_map (name ,"bypass_write_"+toString(i),
     309                                      _name,"bypass_write_"+toString(i));
    310310#endif     
    311311
    … …  
    324324       {
    325325         name = _name+"_execute_queue";
    326          cout << "Instance : " << name << endl;
     326         std::cout << "Instance : " << name << std::endl;
    327327         
    328328#ifdef POSITION
    … …  
    336336
    337337#ifdef POSITION
    338          _component->interface_map (name ,"WRITE_QUEUE_IN",
    339                                     _name+"_write_queue","WRITE_UNIT_IN");
     338         _component->interface_map (name ,"execute_queue_in",
     339                                    _name+"_write_queue","write_queue_in");
    340340#endif
    341341
    … …  
    358358
    359359#ifdef POSITION
    360            _component->interface_map (name ,"EXECUTE_QUEUE_OUT",
    361                                       _name,"WRITE_UNIT_OUT_");
     360           _component->interface_map (name ,"execute_queue_out",
     361                                      _name,"write_unit_out");
    362362#endif
    363363

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_statistics_declaration.cpp

    r74 r75  
    2424    log_printf(FUNC,Write_unit,FUNCTION,"Begin");
    2525
    26     _stat       = new Stat (static_cast<string>(_name),
     26    _stat       = new Stat (static_cast<std::string>(_name),
    2727                            "Write_unit",
    2828                            param_statistics);
Note: See TracChangeset for help on using the changeset viewer.