Changeset 115 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp

Timestamp:

Apr 20, 2009, 11:29:17 PM (15 years ago)

Author:

rosiere

Message:

1) Write queue with mealy
2) Network : fix bug
3) leak memory

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp

@@ -117 +117 @@
                       log_printf(TRACE,Two_Level_Branch_Predictor,FUNCTION,"  * bht");
 
-                      Thistory_t bht_history = (history>>_param->_bht_history_rshift)&_param->_bht_history_mask;
+                      Thistory_t bht_history = (history>>_param->_bht_history_shift )&_param->_bht_history_mask;
                       Thistory_t bht_num_reg = address & _param->_bht_address_mask;
                       
@@ -125 +125 @@
                       // BHT : shift register
                       if (not history_val)
-                        bht_history = (direction)?_param->_bht_init_take:_param->_bht_init_ntake;
+                        {
+                          bht_history = (direction)?_param->_bht_init_take:_param->_bht_init_ntake;
+                        }
                       else
-                        bht_history = ((bht_history<<1) | direction)&_param->_bht_history_mask ;
+                        {
+                          bht_history = ((bht_history<<1) | direction)&_param->_bht_history_mask ;
+                        }
                         
                       pht_bht_history = bht_history;
@@ -138 +142 @@
                       log_printf(TRACE,Two_Level_Branch_Predictor,FUNCTION,"  * pht");
 
-                      Thistory_t pht_history = (history>>_param->_pht_history_rshift)&_param->_pht_history_mask;
-                      Thistory_t pht_num_reg = pht_bht_history xor ((address&_param->_pht_address_share_mask)<<_param->_pht_address_share_lshift);
-                      Thistory_t pht_num_bank= (address>>_param->_pht_address_bank_rshift)&_param->_pht_address_bank_mask;
+                      Thistory_t pht_history = (history>>_param->_pht_history_shift )&_param->_pht_history_mask;
+                      Thistory_t pht_num_bank= (address>>_param->_pht_address_bank_shift )&_param->_pht_address_bank_mask;
+                      Thistory_t pht_num_reg = pht_bht_history xor ((address&_param->_pht_address_share_mask)<<_param->_pht_address_share_shift);
                       
                       log_printf(TRACE,Two_Level_Branch_Predictor,FUNCTION,"    * bht_history (old): %x",pht_bht_history);
@@ -149 +153 @@
                       // PHT : saturation counter
                       if (not history_val)
-                        pht_history = (direction)?_param->_pht_init_take:_param->_pht_init_ntake;
+                        {
+                          pht_history = (direction)?_param->_pht_init_take:_param->_pht_init_ntake;
+                        }
                       else
-                        pht_history = (direction==1)?((pht_history<_param->_pht_counter_max)?(pht_history+1):(pht_history)):((pht_history>0)?(pht_history-1):(pht_history));
+                        {
+                          pht_history = (direction==1)?((pht_history<_param->_pht_counter_max)?(pht_history+1):(pht_history)):((pht_history>0)?(pht_history-1):(pht_history));
+                        }
                       
                       log_printf(TRACE,Two_Level_Branch_Predictor,FUNCTION,"    * pht_history (new): %x",pht_history);