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

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 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/Address_management/src/Address_management_deallocation.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_deallocation.cpp

@@ -23 +23 @@
     log_printf(FUNC,Address_management,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         delete    in_CLOCK ;
@@ -32 +32 @@
         delete    out_ADDRESS_INSTRUCTION_ADDRESS        ;
         delete [] out_ADDRESS_INSTRUCTION_ENABLE         ;
-        if (_param->_have_port_instruction_ptr)
+        if (_param->_have_port_inst_ifetch_ptr)
         delete    out_ADDRESS_INST_IFETCH_PTR            ;
         delete    out_ADDRESS_BRANCH_STATE               ;
-        if (_param->_have_port_branch_update_prediction_id)
+        if (_param->_have_port_depth)
         delete    out_ADDRESS_BRANCH_UPDATE_PREDICTION_ID;
         delete    out_PREDICT_VAL                        ;
@@ -45 +45 @@
         delete     in_PREDICT_PC_NEXT_IS_DS_TAKE         ;
         delete []  in_PREDICT_INSTRUCTION_ENABLE         ;
-        if (_param->_have_port_instruction_ptr)
+        if (_param->_have_port_inst_ifetch_ptr)
         delete     in_PREDICT_INST_IFETCH_PTR            ;
         delete     in_PREDICT_BRANCH_STATE               ;
-        if (_param->_have_port_branch_update_prediction_id)
+        if (_param->_have_port_depth)
         delete     in_PREDICT_BRANCH_UPDATE_PREDICTION_ID;
         delete     in_EVENT_VAL                          ;
         delete    out_EVENT_ACK                          ;
         delete     in_EVENT_ADDRESS                      ;
+        delete     in_EVENT_ADDRESS_NEXT                 ;
+        delete     in_EVENT_ADDRESS_NEXT_VAL             ;
+        delete     in_EVENT_IS_DS_TAKE                   ;
+      
+        // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+        if (usage_is_set(_usage,USE_SYSTEMC))
+          {
+            delete reg_PC_CURRENT_INSTRUCTION_ENABLE;
+            delete reg_PC_NEXT_INSTRUCTION_ENABLE   ;
+          }
       }
 
-    // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-    delete reg_PC_CURRENT_INSTRUCTION_ENABLE;
-    delete reg_PC_NEXT_INSTRUCTION_ENABLE   ;
 
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~