Changeset 68 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_genMealy_read_queue_out_spr.cpp

Timestamp:

Dec 8, 2007, 5:12:36 PM (16 years ago)

Author:

rosiere

Message:

read_queue : systemC et vhdl ok !
queue : quelques petits modif pour avoir une queue de taille 1
nettoyage des fichiers *mkf*

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_genMealy_read_queue_out_spr.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_genMealy_read_queue_out_spr.cpp

@@ -45 +45 @@
                                            PORT_READ(in_SPR_READ_DATA [0]));
 
-//     cout << "yo1 : " << internal_READ_QUEUE_OUT_DATA_RC << endl;
-
     // Test all bypass
     for (uint32_t i=0; i<_param->_nb_spr_write ; i++)
       {
+        bool cmp;
+
+        if (_param->_have_port_ooo_engine_id)
+          cmp = (PORT_READ (in_SPR_WRITE_OOO_ENGINE_ID [i]) == _queue_head->_ooo_engine_id);
+        else
+          cmp = true;
+            
         // Test if this bypass is valid
-        if ( (PORT_READ (in_SPR_WRITE_VAL           [i]) == 1) and
-             (PORT_READ (in_SPR_WRITE_OOO_ENGINE_ID [i]) == _queue_head->_ooo_engine_id)
-             )
+        if ( (PORT_READ (in_SPR_WRITE_VAL [i]) == 1) and cmp)
           {
             if (_queue_head->_num_reg_rc == PORT_READ(in_SPR_WRITE_NUM_REG [i]))
@@ -59 +62 @@
                 log_printf(TRACE,Read_queue,FUNCTION," * internal_READ_QUEUE_OUT_DATA_RC_VAL   - bypass hit (%d)",i);
                 internal_READ_QUEUE_OUT_DATA_RC_VAL = 1;
+#ifdef SYSTEMC_VHDL_COMPATIBILITY
+                if (_queue_head->_read_rc == 1)
+#endif
                 internal_READ_QUEUE_OUT_DATA_RC     = PORT_READ(in_SPR_WRITE_DATA [i]);
               }
           }
       }
-
-//     cout << "yo2 : " << internal_READ_QUEUE_OUT_DATA_RC << endl;
 
     // Affectation out port