Changeset 128 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_deallocation.cpp

Timestamp:

Jun 26, 2009, 10:43:23 AM (15 years ago)

Author:

rosiere

Message:

1) Correct bug in link two signal
2) Fix error detected with valgrind
3) modif distexe script

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_deallocation.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_deallocation.cpp

@@ -32 +32 @@
         DELETE0_SIGNAL( in_EXECUTE_IN_VAL                   ,1);
         DELETE0_SIGNAL(out_EXECUTE_IN_ACK                   ,1);
-        DELETE0_SIGNAL( in_EXECUTE_IN_CONTEXT_ID            , _param->_size_context_id   );
-        DELETE0_SIGNAL( in_EXECUTE_IN_FRONT_END_ID          , _param->_size_front_end_id );
-        DELETE0_SIGNAL( in_EXECUTE_IN_OOO_ENGINE_ID         , _param->_size_ooo_engine_id);
-        DELETE0_SIGNAL( in_EXECUTE_IN_PACKET_ID             , _param->_size_rob_ptr    );
-        DELETE0_SIGNAL( in_EXECUTE_IN_OPERATION             , _param->_size_operation    );
-        DELETE0_SIGNAL( in_EXECUTE_IN_TYPE                  , _param->_size_type         );
+        DELETE0_SIGNAL( in_EXECUTE_IN_CONTEXT_ID            ,_param->_size_context_id   );
+        DELETE0_SIGNAL( in_EXECUTE_IN_FRONT_END_ID          ,_param->_size_front_end_id );
+        DELETE0_SIGNAL( in_EXECUTE_IN_OOO_ENGINE_ID         ,_param->_size_ooo_engine_id);
+        DELETE0_SIGNAL( in_EXECUTE_IN_PACKET_ID             ,_param->_size_rob_ptr      );
+        DELETE0_SIGNAL( in_EXECUTE_IN_OPERATION             ,_param->_size_operation    );
+        DELETE0_SIGNAL( in_EXECUTE_IN_TYPE                  ,_param->_size_type         );
         DELETE0_SIGNAL( in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE ,_param->_size_store_queue_ptr);
         DELETE0_SIGNAL( in_EXECUTE_IN_STORE_QUEUE_PTR_READ  ,_param->_size_store_queue_ptr);
-        DELETE0_SIGNAL( in_EXECUTE_IN_STORE_QUEUE_EMPTY     , 1);
+        DELETE0_SIGNAL( in_EXECUTE_IN_STORE_QUEUE_EMPTY     ,1);
         DELETE0_SIGNAL( in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE  ,_param->_size_load_queue_ptr);
-        DELETE0_SIGNAL( in_EXECUTE_IN_HAS_IMMEDIAT          , 1);
-        DELETE0_SIGNAL( in_EXECUTE_IN_IMMEDIAT              , _param->_size_general_data);
-        DELETE0_SIGNAL( in_EXECUTE_IN_DATA_RA               , _param->_size_general_data);
-        DELETE0_SIGNAL( in_EXECUTE_IN_DATA_RB               , _param->_size_general_data);
-        DELETE0_SIGNAL( in_EXECUTE_IN_DATA_RC               , _param->_size_special_data);
-        DELETE0_SIGNAL( in_EXECUTE_IN_WRITE_RD              , 1);
-        DELETE0_SIGNAL( in_EXECUTE_IN_NUM_REG_RD            , _param->_size_general_register);
-        DELETE0_SIGNAL( in_EXECUTE_IN_WRITE_RE              , 1);
-        DELETE0_SIGNAL( in_EXECUTE_IN_NUM_REG_RE            , _param->_size_special_register);
+        DELETE0_SIGNAL( in_EXECUTE_IN_HAS_IMMEDIAT          ,1);
+        DELETE0_SIGNAL( in_EXECUTE_IN_IMMEDIAT              ,_param->_size_general_data);
+        DELETE0_SIGNAL( in_EXECUTE_IN_DATA_RA               ,_param->_size_general_data);
+        DELETE0_SIGNAL( in_EXECUTE_IN_DATA_RB               ,_param->_size_general_data);
+        DELETE0_SIGNAL( in_EXECUTE_IN_DATA_RC               ,_param->_size_special_data);
+        DELETE0_SIGNAL( in_EXECUTE_IN_WRITE_RD              ,1);
+        DELETE0_SIGNAL( in_EXECUTE_IN_NUM_REG_RD            ,_param->_size_general_register);
+        DELETE0_SIGNAL( in_EXECUTE_IN_WRITE_RE              ,1);
+        DELETE0_SIGNAL( in_EXECUTE_IN_NUM_REG_RE            ,_param->_size_special_register);
 
         DELETE0_SIGNAL(out_EXECUTE_OUT_VAL            ,1);
@@ -72 +72 @@
         // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
         
+        for (uint32_t i=0; i<_param->_nb_type; i++)
+        delete [] _function_execute [i];
+        delete [] _function_execute;
+
         for (uint32_t i=0; i<_param->_nb_context; i++)
-          for (uint32_t j=0; j<_param->_nb_front_end; j++)
-            for (uint32_t k=0; k<_param->_nb_ooo_engine; k++)
-              delete _execute_register [i][j][k];
+          {
+            for (uint32_t j=0; j<_param->_nb_front_end; j++)
+              {
+                for (uint32_t k=0; k<_param->_nb_ooo_engine; k++)
+                delete    _execute_register [i][j][k];
+                delete [] _execute_register [i][j];
+              }
+            delete [] _execute_register [i];
+          }
+        delete [] _execute_register;
 
-        DELETE3(_execute_register,_param->_nb_context,_param->_nb_front_end,_param->_nb_ooo_engine);
-        DELETE0(_execute_param);
+        delete    _execute_param;
+        delete    _execute_operation_out;
         if (_param->_have_pipeline_in)
-        DELETE0(_execute_operation_in);
-        DELETE0(_execute_operation_out);
-        DELETE2(_function_execute,_param->_nb_type,_param->_nb_operation);
+        delete    _execute_operation_in;
       }