Changeset 3 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src

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

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src

Files:

• Two_Level_Branch_Predictor_Glue.cpp (modified) (1 diff)
• Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_pht_address.cpp (modified) (2 diffs)
• Two_Level_Branch_Predictor_Glue_genMealy_predict_bht_address.cpp (modified) (1 diff)
• Two_Level_Branch_Predictor_Glue_vhdl_port.cpp (modified) (1 diff)

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

@@ -47 +47 @@
     _vhdl_testbench = new Vhdl_Testbench (_name);
     vhdl_testbench_port           ();
-    _vhdl_testbench->set_clock    ("in_CLOCK",true);
+    _vhdl_testbench->set_clock    ("in_CLOCK",false);
 #endif
 

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

@@ -26 +26 @@
         {
           // Address
-          Taddress_t address = PORT_READ(in_BRANCH_COMPLETE_ADDRESS [i]);
+          Taddress_t     address = PORT_READ(in_BRANCH_COMPLETE_ADDRESS [i]);
           Tbht_history_t history = 0;
           
@@ -34 +34 @@
               address = address << _param._pht_size_address_shift;
             }
+
+          Taddress_t     pht_address = (history ^ address) & gen_mask<Taddress_t>(_param._pht_size_address);
+
+          log_printf(TRACE,Two_Level_Branch_Predictor_Glue,"genMealy_branch_complete_address","out_BRANCH_COMPLETE_PHT_ADDRESS [%d]= %.8x xor %.8x<<%d = %.8x",i,history,PORT_READ(in_BRANCH_COMPLETE_ADDRESS [i]),_param._pht_size_address_shift, pht_address);
           
-          PORT_WRITE (out_BRANCH_COMPLETE_PHT_ADDRESS [i], (history xor address) & gen_mask<Taddress_t>(_param._pht_size_address));
+          PORT_WRITE (out_BRANCH_COMPLETE_PHT_ADDRESS [i], pht_address);
         }
     

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

@@ -26 +26 @@
         {
           // Address
-          Taddress_t address = PORT_READ(in_PREDICT_ADDRESS [i]);
+          Taddress_t     address = PORT_READ(in_PREDICT_ADDRESS [i]);
+          Taddress_t bht_address = range<Taddress_t>(_param._size_address, address, _param._bht_size_address);
           
-          PORT_WRITE (out_PREDICT_BHT_ADDRESS [i], range<Taddress_t>(_param._size_address, address, _param._bht_size_address));
+          PORT_WRITE (out_PREDICT_BHT_ADDRESS [i], bht_address);
         }
     

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

@@ -21 +21 @@
   {
     log_printf(FUNC,Two_Level_Branch_Predictor_Glue,"vhdl_port","Begin");
-
-    vhdl.set_port (" in_CLOCK" , IN, 1);
 
     for (uint32_t i=0; i<_param._nb_prediction; i++)