Changeset 107 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_genMoore.cpp

Timestamp:

Feb 11, 2009, 12:03:25 AM (15 years ago)

Author:

rosiere

Message:

1) Fix test in Direction_Glue for Conditionnal Branch
2) Fix Instruction Address Compute

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_genMoore.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_genMoore.cpp

@@ -175 +175 @@
                 Tcontrol_t          state_is_ok_ko           = ((state == UPDATE_PREDICTION_STATE_OK   ) or
                                                                 (state == UPDATE_PREDICTION_STATE_KO   ));
-                Tcontrol_t          state_is_event           = ((state == UPDATE_PREDICTION_STATE_KO   ) or
-                                                                (state == UPDATE_PREDICTION_STATE_EVENT)//  or
+//                 Tcontrol_t          state_is_event           = ((state == UPDATE_PREDICTION_STATE_KO   ) or
+//                                                                 (state == UPDATE_PREDICTION_STATE_EVENT)//  or
 //                                                                 ((have_event[context])?(state == UPDATE_PREDICTION_STATE_OK):false)
-                                                                );
-                
-                Tcontrol_t          state_is_event_update    = state_is_event and     need_update(condition);
-                Tcontrol_t          state_is_event_no_update = state_is_event and not need_update(condition);
+//                                                                 );
+                
+//                 Tcontrol_t          state_is_event_update    = state_is_event and     need_update(condition);
+//                 Tcontrol_t          state_is_event_no_update = state_is_event and not need_update(condition);
 
                 if (retire_ras_from_upt [context])
                   {
-                val                   = state_is_event_update;
-                val_without_ack       = state_is_event_no_update;
+//                 val                   = state_is_event_update;
+//                 val_without_ack       = state_is_event_no_update;
+                val                   = ((state == UPDATE_PREDICTION_STATE_KO   ) or 
+                                         ((state == UPDATE_PREDICTION_STATE_EVENT) and need_update(condition)));
+                val_without_ack       = ((state == UPDATE_PREDICTION_STATE_EVENT) and not need_update(condition));
                   }
                 else
@@ -205 +208 @@
                 ras_flush             = (state == UPDATE_PREDICTION_STATE_KO); // miss prediction, RAS is corrupted
                 ras_push              = push_ras(condition);
-                ras_address           = reg_UPDATE_PREDICTION_TABLE [context][depth]._address_ras;
+                // If corrupt, RAS must be flushed.
+                // Also, if instruction l.jal, l.jalr, push addr+2 (delay slot), else (no flush) restore RAS
+                ras_address           = (ras_flush)?(reg_UPDATE_PREDICTION_TABLE [context][depth]._address_src+2):reg_UPDATE_PREDICTION_TABLE [context][depth]._address_ras;
                 ras_index             = reg_UPDATE_PREDICTION_TABLE [context][depth]._index_ras;
                 ras_prediction_ifetch = ifetch;