Changeset 107 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/src/Direction_Glue_genMealy_predict.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/Direction/Direction_Glue/src/Direction_Glue_genMealy_predict.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/src/Direction_Glue_genMealy_predict.cpp

@@ -23 +23 @@
   void Direction_Glue::genMealy_predict (void)
   {
-    log_printf(FUNC,Direction_Glue,FUNCTION,"Begin");
+    log_begin(Direction_Glue,FUNCTION);
+    log_function(Direction_Glue,FUNCTION,_name.c_str());
 
     // constant direction : never / always 
-    switch (_param->_predictor_scheme)
+    for (uint32_t i=0; i<_param->_nb_inst_predict; i++)
       {
-      case PREDICTOR_STATIC    :
-        {
-          for (uint32_t i=0; i<_param->_nb_inst_predict; i++)
-            PORT_WRITE(out_PREDICT_DIRECTION   [i], PORT_READ(in_PREDICT_STATIC    [i]));
-          
-          break;
-        }
-      case PREDICTOR_LAST_TAKE :
-        {
-          for (uint32_t i=0; i<_param->_nb_inst_predict; i++)
-            PORT_WRITE(out_PREDICT_DIRECTION   [i], PORT_READ(in_PREDICT_LAST_TAKE [i]));
+        log_printf(TRACE,Direction_Glue,FUNCTION,"  * PREDICT [%d]",i);
 
-          break;
-        }
-      case PREDICTOR_COUNTER   :
-      case PREDICTOR_LOCAL     :
-      case PREDICTOR_GLOBAL    :
-      case PREDICTOR_META      :
-      case PREDICTOR_CUSTOM    :
-        {
-          for (uint32_t i=0; i<_param->_nb_inst_predict; i++)
-            {
-              // not use :
-              // in_PREDICT_LAST_TAKE       
-              // in_PREDICT_STATIC
+        Tcontrol_t direction;
+
+        switch (_param->_predictor_scheme)
+          {
+            // defined as constant in Direction_Glue.cpp
+//           case PREDICTOR_NEVER_TAKE  :
+//             {
+//               direction = 0;
+//               break;
+//             }
+//           case PREDICTOR_ALWAYS_TAKE :
+//             {
+//               direction = 1;
+//               break;
+//             }
+          case PREDICTOR_STATIC    :
+            {
+              direction = PORT_READ(in_PREDICT_STATIC [i]);
+              break;
+            }
+          case PREDICTOR_LAST_TAKE :
+            {
+              direction = PORT_READ(in_PREDICT_LAST_TAKE [i]);
+              break;
+            }
+          case PREDICTOR_COUNTER   :
+          case PREDICTOR_LOCAL     :
+          case PREDICTOR_GLOBAL    :
+          case PREDICTOR_META      :
+          case PREDICTOR_CUSTOM    :
+            {
+              // not use :
+              // in_PREDICT_LAST_TAKE       
+              // in_PREDICT_STATIC
+              
+              direction = PORT_READ(in_PREDICT_PREDICTOR_DIRECTION [i]);
 
               PORT_WRITE(out_PREDICT_PREDICTOR_VAL         [i], PORT_READ(in_PREDICT_VAL                 [i]));
@@ -58 +72 @@
               PORT_WRITE(out_PREDICT_PREDICTOR_ADDRESS_SRC [i], PORT_READ(in_PREDICT_ADDRESS_SRC         [i]));
               PORT_WRITE(out_PREDICT_HISTORY               [i], PORT_READ(in_PREDICT_PREDICTOR_HISTORY   [i]));
-              PORT_WRITE(out_PREDICT_DIRECTION             [i], PORT_READ(in_PREDICT_PREDICTOR_DIRECTION [i]));
-            }
+              
+              break;
+            }
+          default :
+            {
+              ERRORMORPHEO(FUNCTION,"No valid predictor scheme");
+              break;
+            }
+          }
+      
+        log_printf(TRACE,Direction_Glue,FUNCTION,"    * direction     : %d",direction);
 
-          break;
-        }
-      default :
-        {
-          ERRORMORPHEO(FUNCTION,"No valid predictor scheme");
-          break;
-        }
+        PORT_WRITE(out_PREDICT_DIRECTION   [i], direction);
       }
 
-
-    
-    log_printf(FUNC,Direction_Glue,FUNCTION,"End");
+    log_end(Direction_Glue,FUNCTION);
   };