Changeset 101 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_genMealy_decod_out.cpp

Timestamp:

Jan 15, 2009, 6:19:08 PM (15 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_genMealy_decod_out.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_genMealy_decod_out.cpp

@@ -42 +42 @@
             Tdepth_t   depth           = reg_QUEUE->front()->_depth         [i];
             Tdepth_t   depth_min       = (_param->_have_port_depth)?PORT_READ(in_DEPTH_MIN [context]):0;
-            Tdepth_t   depth_max       = PORT_READ(in_DEPTH_MAX[context]);
+            Tdepth_t   depth_max       = (_param->_have_port_depth)?PORT_READ(in_DEPTH_MAX [context]):0;
+            Tcontrol_t depth_full      = PORT_READ(in_DEPTH_FULL[context]);
 
             // is a valid instruction ?
             // If DEPTH_CURRENT :
             // equal at     DEPTH_MIN            -> not speculative
-            // not include ]DEPTH_MIN:DEPTH_MAX[ -> previous branch miss
-            //     include ]DEPTH_MIN:DEPTH_MAX[ -> speculative
+            // not include ]DEPTH_MIN:DEPTH_MAX] -> previous branch miss
+            //     include ]DEPTH_MIN:DEPTH_MAX] -> speculative
 
             // All case
@@ -58 +59 @@
             // ....... max ...X... min ....... KO
 
-            Tcontrol_t is_valid        = ((depth == depth_min) or 
-                                          ((depth_min < depth_max)?
-                                           (depth<depth_max):
-                                           ((depth > depth_min) or (depth < depth_max))));
+            Tcontrol_t   is_valid      = ((depth == depth_min) or
+                                          depth_full or
+                                          ((depth_min <= depth_max)?
+                                           ((depth >= depth_min) and (depth <=depth_max)):
+                                           ((depth >= depth_min) or  (depth <=depth_max))));
+//          Tcontrol_t is_valid        = ((depth == depth_min) or 
+//                                           ((depth_min < depth_max)?
+//                                            (depth<=depth_max):
+//                                            ((depth > depth_min) or (depth <= depth_max))));
 //          Tcontrol_t is_valid        = depth <= depth_max;
 
-            log_printf(TRACE,Decod_queue,FUNCTION,_("    * is_valid : %d"),is_valid);
-
+            log_printf(TRACE,Decod_queue,FUNCTION,"    * is_valid : %d",is_valid);
+            log_printf(TRACE,Decod_queue,FUNCTION,"      * context   : %d",context);
+            log_printf(TRACE,Decod_queue,FUNCTION,"      * depth     : %d",depth);
+            log_printf(TRACE,Decod_queue,FUNCTION,"      * depth_min : %d",depth_min);
+            log_printf(TRACE,Decod_queue,FUNCTION,"      * depth_max : %d",depth_max);
+            log_printf(TRACE,Decod_queue,FUNCTION,"      * depth_full: %d",depth_full);
+            log_printf(TRACE,Decod_queue,FUNCTION,"      * address   : 0x%x (0x%x)",reg_QUEUE->front()->_address[i],reg_QUEUE->front()->_address[i]<<2);
             internal_DECOD_OUT_VAL [i] = 1; // in all case, val is set (entry is not empty, and instruction is valid)
             if (is_valid)
@@ -81 +92 @@
     for (uint32_t i=0; i<_param->_nb_inst_decod; i++)
       {
-        log_printf(TRACE,Decod_queue,FUNCTION,_("  * DECOD_OUT_VAL : %d"),val [i]);
+        log_printf(TRACE,Decod_queue,FUNCTION,"  * DECOD_OUT_VAL : %d",val [i]);
 
         PORT_WRITE(out_DECOD_OUT_VAL [i],val [i]);