Changeset 136 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_transition.cpp

Timestamp:

Oct 20, 2009, 8:52:15 PM (15 years ago)

Author:

rosiere

Message:

1) Add new algo in ifetch queue
2) Add Cancel bit
3) new config

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_transition.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_transition.cpp

@@ -70 +70 @@
             log_printf(TRACE,Address_management,FUNCTION,"  * PREDICT");
 
-            bool branch_is_current = reg_PC_NEXT_IS_DS_TAKE;
+            bool               branch_is_current            = reg_PC_NEXT_IS_DS_TAKE;
+            Tbranch_state_t    branch_state                 =                                      PORT_READ(in_PREDICT_BRANCH_STATE               );
+            Tprediction_ptr_t  branch_update_prediction_id  = (_param->_have_port_depth          )?PORT_READ(in_PREDICT_BRANCH_UPDATE_PREDICTION_ID):0;
+            Tinst_ifetch_ptr_t inst_ifetch_ptr              = (_param->_have_port_inst_ifetch_ptr)?PORT_READ(in_PREDICT_INST_IFETCH_PTR            ):0;
+
+            log_printf(TRACE,Address_management,FUNCTION,"    * branch_is_current           : %d",branch_is_current          );
+            log_printf(TRACE,Address_management,FUNCTION,"    * branch_state                : %d",branch_state               );
+            log_printf(TRACE,Address_management,FUNCTION,"    * branch_update_prediction_id : %d",branch_update_prediction_id);
+            log_printf(TRACE,Address_management,FUNCTION,"    * inst_ifetch_ptr             : %d",inst_ifetch_ptr            );
+
             if (branch_is_current)
               {
-                if (_param->_have_port_inst_ifetch_ptr)
-                reg_PC_CURRENT_INST_IFETCH_PTR             = PORT_READ(in_PREDICT_INST_IFETCH_PTR            );
-                reg_PC_CURRENT_BRANCH_STATE                = PORT_READ(in_PREDICT_BRANCH_STATE               );
-                if (_param->_have_port_depth)
-                reg_PC_CURRENT_BRANCH_UPDATE_PREDICTION_ID = PORT_READ(in_PREDICT_BRANCH_UPDATE_PREDICTION_ID);
+                reg_PC_CURRENT_INST_IFETCH_PTR             = inst_ifetch_ptr            ;
+                reg_PC_CURRENT_BRANCH_STATE                = branch_state               ;
+                reg_PC_CURRENT_BRANCH_UPDATE_PREDICTION_ID = branch_update_prediction_id;
               }
             else
               {
-                if (_param->_have_port_inst_ifetch_ptr)
-                reg_PC_NEXT_INST_IFETCH_PTR                = PORT_READ(in_PREDICT_INST_IFETCH_PTR            );
-                reg_PC_NEXT_BRANCH_STATE                   = PORT_READ(in_PREDICT_BRANCH_STATE               );
-                if (_param->_have_port_depth)
-                reg_PC_NEXT_BRANCH_UPDATE_PREDICTION_ID    = PORT_READ(in_PREDICT_BRANCH_UPDATE_PREDICTION_ID);
+                reg_PC_NEXT_INST_IFETCH_PTR             = inst_ifetch_ptr            ;
+                reg_PC_NEXT_BRANCH_STATE                = branch_state               ;
+                reg_PC_NEXT_BRANCH_UPDATE_PREDICTION_ID = branch_update_prediction_id;
               }
 
@@ -161 +166 @@
           }
 
-//      if (not reg_PC_NEXT_VAL and reg_PC_NEXT_NEXT_VAL)
         if (reg_PC_NEXT_NEXT_VAL and not reg_PC_NEXT_VAL)
           {