Changeset 124 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src

Timestamp:

Jun 17, 2009, 2:11:25 PM (15 years ago)

Author:

rosiere

Message:

1) Add test and configuration
2) Fix Bug
3) Add log file in load store unit
4) Fix Bug in environment

Location:

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

Files:

• Decod_queue_function_multi_fifo_genMealy_decod_out.cpp (modified) (3 diffs)
• Decod_queue_function_multi_fifo_transition.cpp (modified) (2 diffs)

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

@@ -53 +53 @@
             log_printf(TRACE,Decod_queue,FUNCTION,_("  * Queue is not empty, slot [%d] is valid."),i);
             
-            Tcontext_t context         = reg_QUEUE[num_bank].front()->_context_id    [0];
+            Tcontext_t context  = reg_QUEUE[num_bank].front()->_context_id [0];
 
             log_printf(TRACE,Decod_queue,FUNCTION,"      * context      : %d",context);
@@ -100 +100 @@
                 
                 internal_DECOD_OUT_VAL [i] = 1; // in all case, val is set (entry is not empty, and instruction is valid)
-                
+
                 if (is_valid)
                   {
                     val                    [i] = 1;
                     internal_DECOD_OUT_ACK [i] = PORT_READ(in_DECOD_OUT_ACK [i]);
-                
                   }
                 else
@@ -124 +123 @@
                       }
                   }
+
+                log_printf(TRACE,Decod_queue,FUNCTION,"      * decod_out_ack: %d (%d)",internal_DECOD_OUT_ACK [i],PORT_READ(in_DECOD_OUT_ACK [i]));
               }
           }

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

@@ -117 +117 @@
         //--------------------------------------------------------------------
         {
+          bool can_continue = true; // in_order
+
           for (uint32_t i=0; i<_param->_nb_inst_decod; i++)
-            if (internal_DECOD_OUT_VAL [i] and internal_DECOD_OUT_ACK[i])
+            if (can_continue and (internal_DECOD_OUT_VAL [i] and internal_DECOD_OUT_ACK[i]))
               {
                 log_printf(TRACE,Decod_queue,FUNCTION,_("  * DECOD_OUT [%d]"),i);
@@ -139 +141 @@
                 reg_NB_INST_EVENT [context] --;
               }
+            else
+              can_continue = false;
         }