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

Timestamp:

Feb 16, 2009, 9:28:31 PM (15 years ago)

Author:

rosiere

Message:

1) Configuration : instance configuration file : regroup similar instance
2) Configuration : timing default = 0
3) Debug/Commit_unit : Add watch dog timer
4) Issue_queue : Test parameters : add test if type is optionnal
5) Cor_glue : Fix insert index
6) Free_list : remove bank_by_pop (else deadlock)
7) Update Free List : add register to source event

Location:

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

Files:

• Decod_queue_genMoore.cpp (modified) (1 diff)
• Decod_queue_transition.cpp (modified) (2 diffs)
• Parameters.cpp (modified) (1 diff)
• Parameters_msg_error.cpp (modified) (1 diff)

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

@@ -29 +29 @@
     //--------------------------------------------------------------------
     {
-      Tcontrol_t ack = reg_QUEUE->size() < _param->_size_bank;
+      Tcontrol_t ack = reg_QUEUE->size() < _param->_size_queue;
 
       for (uint32_t i=0; i<_param->_nb_inst_decod; i++)

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

@@ -145 +145 @@
          it++)
       {
-        log_printf(TRACE,Decod_queue,FUNCTION,"    * [%d] ",x);
-
         for (uint32_t i=0; i<_param->_nb_inst_decod; i++)
           {
             if ((*it)->_val [i])
-              log_printf(TRACE,Decod_queue,FUNCTION,"      * [%.4d] %.1d, %.3d %.2d, %.2d %.3d %.1d %.1d, 0x%.8x (0x%.8x), %.1d 0x%.8x, %.1d %.2d, %.1d %.2d, %.1d %.2d, %.1d %.2d, %.1d %.2d, %.1d %.2d"
-                         ,i
+              log_printf(TRACE,Decod_queue,FUNCTION,"    * [%.4d][%.4d] %.1d, %.3d %.2d, %.2d %.3d %.1d %.1d, 0x%.8x (0x%.8x), %.1d 0x%.8x, %.1d %.2d, %.1d %.2d, %.1d %.2d, %.1d %.2d, %.1d %.2d, %.1d %.2d"
+                         ,x
+                         ,i
                          ,(*it)->_val           [i]
                          ,(*it)->_context_id    [i]
@@ -177 +176 @@
                          );
             else
-              log_printf(TRACE,Decod_queue,FUNCTION,"      * [%d] %d"
-                         ,i
+              log_printf(TRACE,Decod_queue,FUNCTION,"    * [%.4d][%.4d] %d"
+                         ,x
+                         ,i
                          ,(*it)->_val           [i]
                          );

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

@@ -29 +29 @@
     log_begin(Decod_queue,FUNCTION);
 
-    _nb_context           = nb_context          ;
-    _nb_inst_decod        = nb_inst_decod       ;
-    _size_queue           = size_queue          ;
-//  _size_general_data    = size_general_data   ;
-    _nb_branch_speculated = nb_branch_speculated;
-
-    _nb_bank              = _nb_inst_decod   ;
-    _size_bank            = _size_queue / _nb_bank;
+    _nb_context              = nb_context              ;
+    _nb_inst_decod           = nb_inst_decod           ;
+    _size_queue              = size_queue/nb_inst_decod;
+//  _size_general_data       = size_general_data   ;
+    _nb_branch_speculated    = nb_branch_speculated;
+    _nb_instruction_in_queue = size_queue;
     
     test();

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

@@ -27 +27 @@
     Parameters_test test ("Decod_queue");
 
-    if (not is_multiple(_size_queue, _nb_inst_decod))
-      test.error(_("size_queue must be a multiple of nb_inst_decod.\n"));
+    if (not is_multiple (_nb_instruction_in_queue,_nb_inst_decod))
+      test.error("Size of decod queue must be a multiple of nb_instruction.\n");
 
     log_end(Decod_queue,FUNCTION);