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.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.cpp (modified) (7 diffs)

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

@@ -77 +77 @@
       sensitive << *(in_SPR_READ_ACK      [i]);
     for (uint32_t i=0; i<_param->_nb_gpr_write; i++)
-      sensitive << *(in_GPR_WRITE_VAL        [i])
-                << *(in_GPR_WRITE_OOO_ENGINE_ID [i])
-                << *(in_GPR_WRITE_NUM_REG    [i]);
+      {
+        if (_param->_have_port_ooo_engine_id)
+          sensitive << *(in_GPR_WRITE_OOO_ENGINE_ID [i]);
+
+        sensitive << *(in_GPR_WRITE_VAL        [i])
+                  << *(in_GPR_WRITE_NUM_REG    [i]);
+      }
     for (uint32_t i=0; i<_param->_nb_spr_write; i++)
-      sensitive << *(in_SPR_WRITE_VAL        [i])
-                << *(in_SPR_WRITE_OOO_ENGINE_ID [i])
-                << *(in_SPR_WRITE_NUM_REG    [i]);
-
+      {
+        if (_param->_have_port_ooo_engine_id)
+          sensitive << *(in_SPR_WRITE_OOO_ENGINE_ID [i]);
+        sensitive << *(in_SPR_WRITE_VAL        [i])
+                  
+                  << *(in_SPR_WRITE_NUM_REG    [i]);
+      }
 #ifdef SYSTEMCASS_SPECIFIC
     // List dependency information
@@ -94 +101 @@
       {
         (*(out_READ_QUEUE_OUT_VAL)) (*(in_GPR_WRITE_VAL        [i]));
+        if (_param->_have_port_ooo_engine_id)
         (*(out_READ_QUEUE_OUT_VAL)) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_VAL)) (*(in_GPR_WRITE_NUM_REG    [i]));
@@ -100 +108 @@
       {
         (*(out_READ_QUEUE_OUT_VAL)) (*(in_SPR_WRITE_VAL        [i]));
+        if (_param->_have_port_ooo_engine_id)
         (*(out_READ_QUEUE_OUT_VAL)) (*(in_SPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_VAL)) (*(in_SPR_WRITE_NUM_REG    [i]));
@@ -115 +124 @@
                 << *(in_GPR_READ_DATA_VAL [i]);
     for (uint32_t i=0; i<_param->_nb_gpr_write; i++)
-      sensitive << *(in_GPR_WRITE_VAL        [i])
-                << *(in_GPR_WRITE_OOO_ENGINE_ID [i])
-                << *(in_GPR_WRITE_NUM_REG    [i])
-                << *(in_GPR_WRITE_DATA       [i]);
-
+      {
+        if (_param->_have_port_ooo_engine_id)
+          sensitive << *(in_GPR_WRITE_OOO_ENGINE_ID [i]);
+        sensitive << *(in_GPR_WRITE_VAL        [i])
+                  << *(in_GPR_WRITE_NUM_REG    [i])
+                  << *(in_GPR_WRITE_DATA       [i]);
+      }
 #ifdef SYSTEMCASS_SPECIFIC
     // List dependency information
@@ -134 +145 @@
       {
         (*(out_READ_QUEUE_OUT_DATA_RA_VAL)) (*(in_GPR_WRITE_VAL        [i]));
-        (*(out_READ_QUEUE_OUT_DATA_RA_VAL)) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
+        if (_param->_have_port_ooo_engine_id)
+          (*(out_READ_QUEUE_OUT_DATA_RA_VAL)) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_DATA_RA_VAL)) (*(in_GPR_WRITE_NUM_REG    [i]));
         (*(out_READ_QUEUE_OUT_DATA_RB_VAL)) (*(in_GPR_WRITE_VAL        [i]));
-        (*(out_READ_QUEUE_OUT_DATA_RB_VAL)) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
+        if (_param->_have_port_ooo_engine_id)
+          (*(out_READ_QUEUE_OUT_DATA_RB_VAL)) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_DATA_RB_VAL)) (*(in_GPR_WRITE_NUM_REG    [i]));
 
         (*(out_READ_QUEUE_OUT_DATA_RA    )) (*(in_GPR_WRITE_VAL        [i]));
-        (*(out_READ_QUEUE_OUT_DATA_RA    )) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
+        if (_param->_have_port_ooo_engine_id)
+          (*(out_READ_QUEUE_OUT_DATA_RA    )) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_DATA_RA    )) (*(in_GPR_WRITE_NUM_REG    [i]));
         (*(out_READ_QUEUE_OUT_DATA_RA    )) (*(in_GPR_WRITE_DATA       [i]));
         (*(out_READ_QUEUE_OUT_DATA_RB    )) (*(in_GPR_WRITE_VAL        [i]));
-        (*(out_READ_QUEUE_OUT_DATA_RB    )) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
+        if (_param->_have_port_ooo_engine_id)
+          (*(out_READ_QUEUE_OUT_DATA_RB    )) (*(in_GPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_DATA_RB    )) (*(in_GPR_WRITE_NUM_REG    [i]));
         (*(out_READ_QUEUE_OUT_DATA_RB    )) (*(in_GPR_WRITE_DATA       [i]));
@@ -161 +176 @@
                 << *(in_SPR_READ_DATA_VAL [i]);
     for (uint32_t i=0; i<_param->_nb_spr_write; i++)
-      sensitive << *(in_SPR_WRITE_VAL        [i])
-                << *(in_SPR_WRITE_OOO_ENGINE_ID [i])
-                << *(in_SPR_WRITE_NUM_REG    [i])
-                << *(in_SPR_WRITE_DATA       [i]);
-
+      {
+        if (_param->_have_port_ooo_engine_id)
+          sensitive << *(in_SPR_WRITE_OOO_ENGINE_ID [i]);
+        sensitive << *(in_SPR_WRITE_VAL        [i])
+                  << *(in_SPR_WRITE_NUM_REG    [i])
+                  << *(in_SPR_WRITE_DATA       [i]);
+      }
 #ifdef SYSTEMCASS_SPECIFIC
     // List dependency information
@@ -177 +194 @@
       {
         (*(out_READ_QUEUE_OUT_DATA_RC_VAL)) (*(in_SPR_WRITE_VAL        [i]));
-        (*(out_READ_QUEUE_OUT_DATA_RC_VAL)) (*(in_SPR_WRITE_OOO_ENGINE_ID [i]));
+        if (_param->_have_port_ooo_engine_id)
+          (*(out_READ_QUEUE_OUT_DATA_RC_VAL)) (*(in_SPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_DATA_RC_VAL)) (*(in_SPR_WRITE_NUM_REG    [i]));
 
         (*(out_READ_QUEUE_OUT_DATA_RC    )) (*(in_SPR_WRITE_VAL        [i]));
-        (*(out_READ_QUEUE_OUT_DATA_RC    )) (*(in_SPR_WRITE_OOO_ENGINE_ID [i]));
+        if (_param->_have_port_ooo_engine_id)
+          (*(out_READ_QUEUE_OUT_DATA_RC    )) (*(in_SPR_WRITE_OOO_ENGINE_ID [i]));
         (*(out_READ_QUEUE_OUT_DATA_RC    )) (*(in_SPR_WRITE_NUM_REG    [i]));
         (*(out_READ_QUEUE_OUT_DATA_RC    )) (*(in_SPR_WRITE_DATA       [i]));