Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/src/Ifetch_unit_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/src/Ifetch_unit_deallocation.cpp (modified) (6 diffs)

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

@@ -22 +22 @@
     log_printf(FUNC,Ifetch_unit,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         delete     in_CLOCK ;
@@ -30 +30 @@
         delete     in_ICACHE_REQ_ACK                      ;
       //delete    out_ICACHE_REQ_THREAD_ID                ;
-        if (_param->_have_port_queue_ptr)
+        if (_param->_have_port_ifetch_queue_ptr)
         delete    out_ICACHE_REQ_PACKET_ID                ;
         delete    out_ICACHE_REQ_ADDRESS                  ;
@@ -38 +38 @@
         delete    out_ICACHE_RSP_ACK                      ;
       //delete     in_ICACHE_RSP_THREAD_ID                ;
-        if (_param->_have_port_queue_ptr)
+        if (_param->_have_port_ifetch_queue_ptr)
         delete     in_ICACHE_RSP_PACKET_ID                ;
         delete []  in_ICACHE_RSP_INSTRUCTION              ;
@@ -51 +51 @@
         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 ;
 
@@ -62 +62 @@
       //delete    out_DECOD_CONTEXT_ID                    ;
         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                     ;
@@ -72 +72 @@
         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                    ;
       }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~