Changeset 3 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp

Timestamp:

Mar 6, 2007, 3:34:04 PM (17 years ago)

Author:

kane

Message:

1) Ajout d'un "printer" XML pour la configuration de paramètres

2) Fin du composant "Two_Level_Branch_Predictor"

validation * systemc

• vhdl

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp

@@ -32 +32 @@
     _pht_size_counter       ((_have_pht == true)?pht_size_counter:0),
     _pht_nb_counter         ((_have_pht == true)?pht_nb_counter  :0),
-    _pht_size_address_share (pht_size_address_share),
+    _pht_size_address_share (((_have_bht and _have_pht) == true)?pht_size_address_share:0),
     _size_address           (size_address      ),
     _nb_prediction          (nb_prediction     ),
@@ -41 +41 @@
     log_printf(FUNC,Two_Level_Branch_Predictor,"Parameters","Begin");
     
+    if (_have_bht)
     _param_branch_history_table  = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
                                                                                                                                                                        _bht_nb_shifter    ,
                                                                                                                                                                        _nb_prediction     ,
                                                                                                                                                                        _nb_branch_complete);
+    if (_have_pht)
     _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
                                                                                                                                                                        _pht_nb_counter    ,
@@ -82 +84 @@
     log_printf(FUNC,Two_Level_Branch_Predictor,"Parameters","Begin");
 
+    if (_have_bht)
     _param_branch_history_table  = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
                                                                                                                                                                        _bht_nb_shifter    ,
                                                                                                                                                                        _nb_prediction     ,
                                                                                                                                                                        _nb_branch_complete);
+    if (_have_pht)
     _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
                                                                                                                                                                        _pht_nb_counter    ,
@@ -109 +113 @@
     log_printf(FUNC,Two_Level_Branch_Predictor,"~Parameters","Begin");
 
+    if (_have_bht)
     delete _param_branch_history_table;
+    if (_have_pht)
     delete _param_pattern_history_table;
     delete _param_two_level_branch_predictor_glue;