Ignore:
Timestamp:
Mar 18, 2009, 11:36:26 PM (15 years ago)
Author:
rosiere
Message:

1) Stat_list : fix retire old and new register bug
2) Stat_list : remove read_counter and valid flag, because validation of destination is in retire step (not in commit step)
3) Model : add class Model (cf Morpheo.sim)
4) Allocation : alloc_interface_begin and alloc_interface_end to delete temporary array.
5) Script : add distexe.sh
6) Add Comparator, Multiplier, Divider. But this component are not implemented
7) Software : add Dhrystone

Location:
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/src/Register_Address_Translation_unit_allocation.cpp

    r104 r112  
    5959    // ~~~~~[ Interface "rename" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    6060    {
    61       ALLOC1_INTERFACE("rename",IN,EAST,"Input to rename source logical register", _param->_nb_inst_insert);
     61      ALLOC1_INTERFACE_BEGIN("rename",IN,EAST,_("Input to rename source logical register"), _param->_nb_inst_insert);
    6262
    6363      ALLOC1_VALACK_IN ( in_RENAME_VAL               , VAL);
     
    7575      ALLOC1_SIGNAL_OUT(out_RENAME_NUM_REG_RD_PHY_OLD,"num_reg_rd_phy_old",Tgeneral_address_t,_param->_size_general_register);
    7676      ALLOC1_SIGNAL_OUT(out_RENAME_NUM_REG_RE_PHY_OLD,"num_reg_re_phy_old",Tspecial_address_t,_param->_size_special_register);
     77
     78      ALLOC1_INTERFACE_END(_param->_nb_inst_insert);
    7779    }
    7880   
    7981    // ~~~~~[ Interface "insert" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    8082    {
    81       ALLOC1_INTERFACE("insert",IN,NORTH,"Input to rename destination logical register", _param->_nb_inst_insert);
     83      ALLOC1_INTERFACE_BEGIN("insert",IN,NORTH,_("Input to rename destination logical register"), _param->_nb_inst_insert);
    8284     
    8385      ALLOC1_VALACK_IN ( in_INSERT_VAL           ,VAL);
     
    9193      ALLOC1_SIGNAL_IN ( in_INSERT_NUM_REG_RD_PHY,"num_reg_rd_phy",Tgeneral_address_t,_param->_size_general_register);
    9294      ALLOC1_SIGNAL_IN ( in_INSERT_NUM_REG_RE_PHY,"num_reg_re_phy",Tspecial_address_t,_param->_size_special_register);
     95
     96      ALLOC1_INTERFACE_END(_param->_nb_inst_insert);
    9397    }
    9498   
    9599    // ~~~~~[ Interface "retire" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    96100    {
    97       ALLOC1_INTERFACE("retire",IN,NORTH,"Input to update on event", _param->_nb_inst_retire);
     101      ALLOC1_INTERFACE_BEGIN("retire",IN,NORTH,_("Input to update on event"), _param->_nb_inst_retire);
    98102
    99103      ALLOC1_VALACK_IN ( in_RETIRE_VAL               ,VAL);
     
    109113      ALLOC1_SIGNAL_OUT(out_RETIRE_RESTORE_RD_PHY_OLD,"restore_rd_phy_old",Tcontrol_t        ,1);
    110114      ALLOC1_SIGNAL_OUT(out_RETIRE_RESTORE_RE_PHY_OLD,"restore_re_phy_old",Tcontrol_t        ,1);
     115      ALLOC1_SIGNAL_OUT(out_RETIRE_RESTORE           ,"restore"           ,Tcontrol_t        ,1);
     116
     117      ALLOC1_INTERFACE_END(_param->_nb_inst_retire);
    111118    }
    112119
    113120    // ~~~~~[ Interface : "retire_event" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    114121    {
    115       ALLOC2_INTERFACE("retire_event", IN,NORTH, _("Retire event"), _param->_nb_front_end, _param->_nb_context[it1]);
     122      ALLOC2_INTERFACE_BEGIN("retire_event", IN,NORTH, _("Retire event"), _param->_nb_front_end, _param->_nb_context[it1]);
    116123
    117124      _ALLOC2_VALACK_IN ( in_RETIRE_EVENT_VAL        ,VAL,_param->_nb_front_end, _param->_nb_context[it1]);
    118125      _ALLOC2_VALACK_OUT(out_RETIRE_EVENT_ACK        ,ACK,_param->_nb_front_end, _param->_nb_context[it1]);
    119126      _ALLOC2_SIGNAL_IN ( in_RETIRE_EVENT_STATE      ,"state"             ,Tevent_state_t    ,_param->_size_event_state, _param->_nb_front_end, _param->_nb_context[it1]);
     127
     128      ALLOC2_INTERFACE_END(_param->_nb_front_end, _param->_nb_context[it1]);
    120129    }
    121130
     
    127136    ALLOC2(internal_RETIRE_EVENT_ACK ,Tcontrol_t,_param->_nb_front_end,_param->_nb_context[it1]);
    128137
    129     rat_gpr                       = new Tgeneral_address_t ** [_param->_nb_front_end];
    130     rat_spr                       = new Tspecial_address_t ** [_param->_nb_front_end];
    131     rat_gpr_update_table          = new bool               ** [_param->_nb_front_end];
    132     rat_spr_update_table          = new bool               ** [_param->_nb_front_end];
    133     internal_rat_gpr_update_table = new bool               ** [_param->_nb_front_end];
    134     internal_rat_spr_update_table = new bool               ** [_param->_nb_front_end];
     138    ALLOC3(rat_gpr                      ,Tgeneral_address_t,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_general_register_logic);
     139    ALLOC3(rat_spr                      ,Tspecial_address_t,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_special_register_logic);
     140    ALLOC3(rat_gpr_update_table         ,bool              ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_general_register_logic);
     141    ALLOC3(rat_spr_update_table         ,bool              ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_special_register_logic);
     142    ALLOC3(internal_rat_gpr_update_table,bool              ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_general_register_logic);
     143    ALLOC3(internal_rat_spr_update_table,bool              ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_special_register_logic);
    135144
    136     for (uint32_t i=0; i<_param->_nb_front_end; i++)
    137       {
    138         rat_gpr                       [i] = new Tgeneral_address_t * [_param->_nb_context[i]];
    139         rat_spr                       [i] = new Tspecial_address_t * [_param->_nb_context[i]];
    140         rat_gpr_update_table          [i] = new bool               * [_param->_nb_context[i]];
    141         rat_spr_update_table          [i] = new bool               * [_param->_nb_context[i]];
    142         internal_rat_gpr_update_table [i] = new bool               * [_param->_nb_context[i]];
    143         internal_rat_spr_update_table [i] = new bool               * [_param->_nb_context[i]];
    144 
    145         for (uint32_t j=0; j<_param->_nb_context[i]; j++)
    146           {
    147             rat_gpr                       [i][j] = new Tgeneral_address_t [_param->_nb_general_register_logic];
    148             rat_spr                       [i][j] = new Tspecial_address_t [_param->_nb_special_register_logic];
    149             rat_gpr_update_table          [i][j] = new bool               [_param->_nb_general_register_logic];
    150             rat_spr_update_table          [i][j] = new bool               [_param->_nb_special_register_logic];
    151             internal_rat_gpr_update_table [i][j] = new bool               [_param->_nb_general_register_logic];
    152             internal_rat_spr_update_table [i][j] = new bool               [_param->_nb_special_register_logic];
    153           }
    154       }
     145    ALLOC1(internal_RETIRE_RESTORE_RD_PHY_OLD,Tcontrol_t,_param->_nb_inst_retire);
     146    ALLOC1(internal_RETIRE_RESTORE_RE_PHY_OLD,Tcontrol_t,_param->_nb_inst_retire);
    155147      }
    156148
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/src/Register_Address_Translation_unit_deallocation.cpp

    r104 r112  
    3030        delete     in_NRESET;
    3131
    32         delete []  in_RENAME_VAL             ;
    33         delete [] out_RENAME_ACK             ;
    34         if (_param->_have_port_front_end_id)
    35         delete []  in_RENAME_FRONT_END_ID    ;
    36         if (_param->_have_port_context_id)
    37         delete []  in_RENAME_CONTEXT_ID      ;
    38         delete []  in_RENAME_NUM_REG_RA_LOG  ;
    39         delete []  in_RENAME_NUM_REG_RB_LOG  ;
    40         delete []  in_RENAME_NUM_REG_RC_LOG  ;
    41         delete []  in_RENAME_NUM_REG_RD_LOG  ;
    42         delete []  in_RENAME_NUM_REG_RE_LOG  ;
    43         delete [] out_RENAME_NUM_REG_RA_PHY  ;
    44         delete [] out_RENAME_NUM_REG_RB_PHY  ;
    45         delete [] out_RENAME_NUM_REG_RC_PHY  ;
    46         delete [] out_RENAME_NUM_REG_RD_PHY_OLD;
    47         delete [] out_RENAME_NUM_REG_RE_PHY_OLD;
     32        DELETE1_SIGNAL( in_RENAME_VAL               ,_param->_nb_inst_insert,1);
     33        DELETE1_SIGNAL(out_RENAME_ACK               ,_param->_nb_inst_insert,1);
     34        DELETE1_SIGNAL( in_RENAME_FRONT_END_ID      ,_param->_nb_inst_insert,_param->_size_front_end_id);
     35        DELETE1_SIGNAL( in_RENAME_CONTEXT_ID        ,_param->_nb_inst_insert,_param->_size_context_id  );
     36        DELETE1_SIGNAL( in_RENAME_NUM_REG_RA_LOG    ,_param->_nb_inst_insert,_param->_size_general_register_logic);
     37        DELETE1_SIGNAL( in_RENAME_NUM_REG_RB_LOG    ,_param->_nb_inst_insert,_param->_size_general_register_logic);
     38        DELETE1_SIGNAL( in_RENAME_NUM_REG_RC_LOG    ,_param->_nb_inst_insert,_param->_size_special_register_logic);
     39        DELETE1_SIGNAL( in_RENAME_NUM_REG_RD_LOG    ,_param->_nb_inst_insert,_param->_size_general_register_logic);
     40        DELETE1_SIGNAL( in_RENAME_NUM_REG_RE_LOG    ,_param->_nb_inst_insert,_param->_size_special_register_logic);
     41        DELETE1_SIGNAL(out_RENAME_NUM_REG_RA_PHY    ,_param->_nb_inst_insert,_param->_size_general_register);
     42        DELETE1_SIGNAL(out_RENAME_NUM_REG_RB_PHY    ,_param->_nb_inst_insert,_param->_size_general_register);
     43        DELETE1_SIGNAL(out_RENAME_NUM_REG_RC_PHY    ,_param->_nb_inst_insert,_param->_size_special_register);
     44        DELETE1_SIGNAL(out_RENAME_NUM_REG_RD_PHY_OLD,_param->_nb_inst_insert,_param->_size_general_register);
     45        DELETE1_SIGNAL(out_RENAME_NUM_REG_RE_PHY_OLD,_param->_nb_inst_insert,_param->_size_special_register);
    4846
    49         delete []  in_INSERT_VAL             ;
    50         delete [] out_INSERT_ACK             ;
    51 //      if (_param->_have_port_front_end_id)
    52 //      delete []  in_INSERT_FRONT_END_ID    ;
    53 //      if (_param->_have_port_context_id)
    54 //      delete []  in_INSERT_CONTEXT_ID      ;
    55         delete []  in_INSERT_WRITE_RD        ;
    56         delete []  in_INSERT_WRITE_RE        ;
    57         delete []  in_INSERT_NUM_REG_RD_LOG  ;
    58         delete []  in_INSERT_NUM_REG_RE_LOG  ;
    59         delete []  in_INSERT_NUM_REG_RD_PHY  ;
    60         delete []  in_INSERT_NUM_REG_RE_PHY  ;
     47        DELETE1_SIGNAL( in_INSERT_VAL           ,_param->_nb_inst_insert,1);
     48        DELETE1_SIGNAL(out_INSERT_ACK           ,_param->_nb_inst_insert,1);
     49//      DELETE1_SIGNAL( in_INSERT_FRONT_END_ID  ,_param->_nb_inst_insert,_param->_size_front_end_id);
     50//      DELETE1_SIGNAL( in_INSERT_CONTEXT_ID    ,_param->_nb_inst_insert,_param->_size_context_id  );
     51        DELETE1_SIGNAL( in_INSERT_WRITE_RD      ,_param->_nb_inst_insert,1);
     52        DELETE1_SIGNAL( in_INSERT_WRITE_RE      ,_param->_nb_inst_insert,1);
     53        DELETE1_SIGNAL( in_INSERT_NUM_REG_RD_LOG,_param->_nb_inst_insert,_param->_size_general_register_logic);
     54        DELETE1_SIGNAL( in_INSERT_NUM_REG_RE_LOG,_param->_nb_inst_insert,_param->_size_special_register_logic);
     55        DELETE1_SIGNAL( in_INSERT_NUM_REG_RD_PHY,_param->_nb_inst_insert,_param->_size_general_register);
     56        DELETE1_SIGNAL( in_INSERT_NUM_REG_RE_PHY,_param->_nb_inst_insert,_param->_size_special_register);
    6157
    62         delete []  in_RETIRE_VAL               ;
    63         delete [] out_RETIRE_ACK               ;
    64         if (_param->_have_port_front_end_id)
    65         delete []  in_RETIRE_FRONT_END_ID      ;
    66         if (_param->_have_port_context_id)
    67         delete []  in_RETIRE_CONTEXT_ID        ;
    68         delete []  in_RETIRE_WRITE_RD          ;
    69         delete []  in_RETIRE_WRITE_RE          ;
    70         delete []  in_RETIRE_NUM_REG_RD_LOG    ;
    71         delete []  in_RETIRE_NUM_REG_RE_LOG    ;
    72         delete []  in_RETIRE_NUM_REG_RD_PHY_OLD;
    73         delete []  in_RETIRE_NUM_REG_RE_PHY_OLD;
    74         delete [] out_RETIRE_RESTORE_RD_PHY_OLD;
    75         delete [] out_RETIRE_RESTORE_RE_PHY_OLD;
     58        DELETE1_SIGNAL( in_RETIRE_VAL               ,_param->_nb_inst_retire,1);
     59        DELETE1_SIGNAL(out_RETIRE_ACK               ,_param->_nb_inst_retire,1);
     60        DELETE1_SIGNAL( in_RETIRE_FRONT_END_ID      ,_param->_nb_inst_retire,_param->_size_front_end_id);
     61        DELETE1_SIGNAL( in_RETIRE_CONTEXT_ID        ,_param->_nb_inst_retire,_param->_size_context_id  );
     62        DELETE1_SIGNAL( in_RETIRE_WRITE_RD          ,_param->_nb_inst_retire,1);
     63        DELETE1_SIGNAL( in_RETIRE_WRITE_RE          ,_param->_nb_inst_retire,1);
     64        DELETE1_SIGNAL( in_RETIRE_NUM_REG_RD_LOG    ,_param->_nb_inst_retire,_param->_size_general_register_logic);
     65        DELETE1_SIGNAL( in_RETIRE_NUM_REG_RE_LOG    ,_param->_nb_inst_retire,_param->_size_special_register_logic);
     66        DELETE1_SIGNAL( in_RETIRE_NUM_REG_RD_PHY_OLD,_param->_nb_inst_retire,_param->_size_general_register);
     67        DELETE1_SIGNAL( in_RETIRE_NUM_REG_RE_PHY_OLD,_param->_nb_inst_retire,_param->_size_special_register);
     68        DELETE1_SIGNAL(out_RETIRE_RESTORE_RD_PHY_OLD,_param->_nb_inst_retire,1);
     69        DELETE1_SIGNAL(out_RETIRE_RESTORE_RE_PHY_OLD,_param->_nb_inst_retire,1);
     70        DELETE1_SIGNAL(out_RETIRE_RESTORE           ,_param->_nb_inst_retire,1);
     71
     72        DELETE2_SIGNAL( in_RETIRE_EVENT_VAL            ,_param->_nb_front_end, _param->_nb_context[it1],1);
     73        DELETE2_SIGNAL(out_RETIRE_EVENT_ACK            ,_param->_nb_front_end, _param->_nb_context[it1],1);
     74        DELETE2_SIGNAL( in_RETIRE_EVENT_STATE          ,_param->_nb_front_end, _param->_nb_context[it1],_param->_size_event_state);
    7675
    7776        DELETE1(internal_RENAME_ACK                    ,_param->_nb_inst_insert);
     
    8079        DELETE2(internal_RETIRE_EVENT_ACK              ,_param->_nb_front_end,_param->_nb_context[it1]);
    8180
    82         DELETE2_SIGNAL( in_RETIRE_EVENT_VAL            ,_param->_nb_front_end, _param->_nb_context[it1],1);
    83         DELETE2_SIGNAL(out_RETIRE_EVENT_ACK            ,_param->_nb_front_end, _param->_nb_context[it1],1);
    84         DELETE2_SIGNAL( in_RETIRE_EVENT_STATE          ,_param->_nb_front_end, _param->_nb_context[it1],_param->_size_event_state);
     81        DELETE3(rat_gpr                      ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_general_register_logic);
     82        DELETE3(rat_spr                      ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_special_register_logic);
     83        DELETE3(rat_gpr_update_table         ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_general_register_logic);
     84        DELETE3(rat_spr_update_table         ,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_special_register_logic);
     85        DELETE3(internal_rat_gpr_update_table,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_general_register_logic);
     86        DELETE3(internal_rat_spr_update_table,_param->_nb_front_end,_param->_nb_context[it1],_param->_nb_special_register_logic);
    8587       
    86         delete [] rat_gpr             ;
    87         delete [] rat_spr             ;
    88         delete [] rat_gpr_update_table;
    89         delete [] rat_spr_update_table;
    90         delete [] internal_rat_gpr_update_table;
    91         delete [] internal_rat_spr_update_table;
     88        DELETE1(internal_RETIRE_RESTORE_RD_PHY_OLD,_param->_nb_inst_retire);
     89        DELETE1(internal_RETIRE_RESTORE_RE_PHY_OLD,_param->_nb_inst_retire);
    9290      }
    9391
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/src/Register_Address_Translation_unit_genMealy_retire.cpp

    r106 r112  
    3131        {
    3232          // An event occure
    33           bool no_event = not (PORT_READ(in_RETIRE_EVENT_STATE [i][j]) and (PORT_READ(in_RETIRE_EVENT_STATE [i][j]) == EVENT_STATE_EVENT));
     33          // bool event = (PORT_READ(in_RETIRE_EVENT_STATE [i][j]) != EVENT_STATE_NO_EVENT);
     34          bool reset_update_table = (PORT_READ(in_RETIRE_EVENT_VAL [i][j]) and // always ack
     35                                     (PORT_READ(in_RETIRE_EVENT_STATE [i][j]) == EVENT_STATE_EVENT));
     36
     37          // not event -> update_table == 1 -> always update
     38          // event     -> update_table and not reset
    3439          for (uint32_t k=0; k<_param->_nb_general_register_logic; ++k)
    35             internal_rat_gpr_update_table [i][j][k] = rat_gpr_update_table [i][j][k] and no_event;
     40            internal_rat_gpr_update_table [i][j][k] = // not event or
     41                                                      (rat_gpr_update_table [i][j][k] and not reset_update_table);
    3642          for (uint32_t k=0; k<_param->_nb_special_register_logic; ++k)
    37             internal_rat_spr_update_table [i][j][k] = rat_spr_update_table [i][j][k] and no_event;
     43            internal_rat_spr_update_table [i][j][k] = // not event or
     44                                                      (rat_spr_update_table [i][j][k] and not reset_update_table);
    3845        }
    3946
     
    5057        Tcontext_t front_end_id = (_param->_have_port_front_end_id)?PORT_READ(in_RETIRE_FRONT_END_ID [i]):0;
    5158        Tcontext_t context_id   = (_param->_have_port_context_id  )?PORT_READ(in_RETIRE_CONTEXT_ID   [i]):0;
     59        Tcontrol_t restore      = (PORT_READ(in_RETIRE_EVENT_STATE [front_end_id][context_id]) != EVENT_STATE_NO_EVENT);
    5260
    5361        // Test if event -> need restore ?
    54         if (PORT_READ(in_RETIRE_EVENT_STATE [front_end_id][context_id]) != EVENT_STATE_NO_EVENT)
     62        if (restore)
    5563          {
    5664            log_printf(TRACE,Register_Address_Translation_unit,FUNCTION,"    * Have event");
     
    8290            log_printf(TRACE,Register_Address_Translation_unit,FUNCTION,"    * restore_re_phy_old   : %d",retire_restore_re_phy_old);
    8391          }
     92
     93        internal_RETIRE_RESTORE_RD_PHY_OLD[i] = retire_restore_rd_phy_old;
     94        internal_RETIRE_RESTORE_RE_PHY_OLD[i] = retire_restore_re_phy_old;
    8495             
    85         PORT_WRITE(out_RETIRE_RESTORE_RD_PHY_OLD[i], retire_restore_rd_phy_old);
    86         PORT_WRITE(out_RETIRE_RESTORE_RE_PHY_OLD[i], retire_restore_re_phy_old);
     96        PORT_WRITE(out_RETIRE_RESTORE_RD_PHY_OLD[i], internal_RETIRE_RESTORE_RD_PHY_OLD[i]);
     97        PORT_WRITE(out_RETIRE_RESTORE_RE_PHY_OLD[i], internal_RETIRE_RESTORE_RE_PHY_OLD[i]);
     98        PORT_WRITE(out_RETIRE_RESTORE           [i], restore);
    8799      }
    88100
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/src/Register_Address_Translation_unit_transition.cpp

    r106 r112  
    125125              log_printf(TRACE,Register_Address_Translation_unit,FUNCTION,"    * event_state  : %d",event_state);
    126126
    127               if (event_state != EVENT_STATE_NO_EVENT)
    128                 {
     127//            if (event_state != EVENT_STATE_NO_EVENT)
     128//              {
    129129                  // Test if write and have not a previous update
    130130                  if (PORT_READ(in_RETIRE_WRITE_RD [i]) == 1)
    131131                    {
    132132                      Tgeneral_address_t rd_log = PORT_READ(in_RETIRE_NUM_REG_RD_LOG [i]);
    133                      
     133                     
    134134                      log_printf(TRACE,Register_Address_Translation_unit,FUNCTION,"    * retire RD");
    135135                      log_printf(TRACE,Register_Address_Translation_unit,FUNCTION,"      * rd_log       : %d",rd_log);
    136136                     
    137 //                    if (RETIRE_RESTORE_RD_PHY_OLD [i])
    138                       if (rat_gpr_update_table [front_end_id][context_id][rd_log] == 0)
     137// #ifdef DEBUG_TEST
     138//                       if (not (internal_RETIRE_RESTORE_RD_PHY_OLD [i] and ( (rat_gpr_update_table [front_end_id][context_id][rd_log] == 0)) and (event_state != EVENT_STATE_NO_EVENT)))
     139//                         throw ERRORMORPHEO(FUNCTION,toString(_("restore_rd_phy_old [%d] = %d, but rat_gpr_update_table[%d][%d][%d] = %d\n"),
     140//                                                              i,internal_RETIRE_RESTORE_RD_PHY_OLD [i],
     141//                                                              front_end_id,context_id,rd_log,rat_gpr_update_table [front_end_id][context_id][rd_log]));
     142// #endif
     143
     144                      if (internal_RETIRE_RESTORE_RD_PHY_OLD [i])
     145//                    if (rat_gpr_update_table [front_end_id][context_id][rd_log] == 0)
    139146                        {                     
    140147                          rat_gpr              [front_end_id][context_id][rd_log] = PORT_READ(in_RETIRE_NUM_REG_RD_PHY_OLD [i]);
     
    150157                      log_printf(TRACE,Register_Address_Translation_unit,FUNCTION,"      * re_log       : %d",re_log);
    151158
    152 //                    if (RETIRE_RESTORE_RE_PHY_OLD [i])
    153                       if (rat_spr_update_table [front_end_id][context_id][re_log] == 0)
     159// #ifdef DEBUG_TEST
     160//                       if (not (internal_RETIRE_RESTORE_RE_PHY_OLD [i] and ((rat_spr_update_table [front_end_id][context_id][re_log] == 0) and (event_state != EVENT_STATE_NO_EVENT))))
     161//                         throw ERRORMORPHEO(FUNCTION,toString(_("restore_re_phy_old [%d] = %d, but rat_spr_update_table[%d][%d][%d] = %d\n"),
     162//                                                              i,internal_RETIRE_RESTORE_RE_PHY_OLD [i],
     163//                                                              front_end_id,context_id,re_log,rat_spr_update_table [front_end_id][context_id][re_log]));
     164// #endif
     165
     166                      if (internal_RETIRE_RESTORE_RE_PHY_OLD [i])
     167//                    if (rat_spr_update_table [front_end_id][context_id][re_log] == 0)
    154168                        {                     
    155169                          rat_spr              [front_end_id][context_id][re_log] = PORT_READ(in_RETIRE_NUM_REG_RE_PHY_OLD [i]);
     
    157171                        }
    158172                    }
    159                 }
     173//              }
    160174            }
    161175      }
Note: See TracChangeset for help on using the changeset viewer.