Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/src/Ifetch_queue_deallocation.cpp

Timestamp:

Dec 10, 2008, 7:31:39 PM (15 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/src/Ifetch_queue_deallocation.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/src/Ifetch_queue_deallocation.cpp

@@ -23 +23 @@
     log_printf(FUNC,Ifetch_queue,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         delete    in_CLOCK ;
@@ -30 +30 @@
         delete     in_ADDRESS_VAL                        ;
         delete    out_ADDRESS_ACK                        ;
-        if (_param->_have_port_queue_ptr)
+        if (_param->_have_port_ifetch_queue_ptr)
         delete    out_ADDRESS_IFETCH_QUEUE_ID            ;
         delete []  in_ADDRESS_INSTRUCTION_ENABLE         ;
         delete     in_ADDRESS_INSTRUCTION_ADDRESS        ;
-        if (_param->_have_port_instruction_ptr)
+        if (_param->_have_port_inst_ifetch_ptr)
         delete     in_ADDRESS_INST_IFETCH_PTR            ;
         delete     in_ADDRESS_BRANCH_STATE               ;
-        if (_param->_have_port_branch_update_prediction_id)
+        if (_param->_have_port_depth)
         delete     in_ADDRESS_BRANCH_UPDATE_PREDICTION_ID;
         delete [] out_DECOD_VAL                          ;
@@ -43 +43 @@
         delete [] out_DECOD_INSTRUCTION                  ;
         delete    out_DECOD_ADDRESS                      ;
-        if (_param->_have_port_instruction_ptr)
+        if (_param->_have_port_inst_ifetch_ptr)
         delete    out_DECOD_INST_IFETCH_PTR              ;
         delete    out_DECOD_BRANCH_STATE                 ;
-        if (_param->_have_port_branch_update_prediction_id)
+        if (_param->_have_port_depth)
         delete    out_DECOD_BRANCH_UPDATE_PREDICTION_ID  ;
         delete    out_DECOD_EXCEPTION                    ;
         delete     in_ICACHE_RSP_VAL                     ;
         delete    out_ICACHE_RSP_ACK                     ;
-        if (_param->_have_port_queue_ptr)
+        if (_param->_have_port_ifetch_queue_ptr)
         delete     in_ICACHE_RSP_PACKET_ID               ;
         delete []  in_ICACHE_RSP_INSTRUCTION             ;
@@ -58 +58 @@
         delete    out_EVENT_RESET_ACK                    ;
       }
+
+    // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+    if (usage_is_set(_usage,USE_SYSTEMC))
+      {
+        delete    internal_DECOD_VAL;
+        delete [] _queue;
+      }
+
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-
-    delete    internal_DECOD_VAL;
-    delete [] _queue;
     delete    _component;