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

Timestamp:

Mar 18, 2009, 11:36:26 PM (15 years ago)

Author:

rosiere

Message:

1) Stat_list : fix retire old and new register bug
2) Stat_list : remove read_counter and valid flag, because validation of destination is in retire step (not in commit step)
3) Model : add class Model (cf Morpheo.sim)
4) Allocation : alloc_interface_begin and alloc_interface_end to delete temporary array.
5) Script : add distexe.sh
6) Add Comparator, Multiplier, Divider. But this component are not implemented
7) Software : add Dhrystone

File:

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

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

@@ -7 +7 @@
 
 #include "Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/include/Ifetch_queue.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {
@@ -28 +29 @@
         delete    in_NRESET;
 
-        delete     in_ADDRESS_VAL                        ;
-        delete    out_ADDRESS_ACK                        ;
-        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_inst_ifetch_ptr)
-        delete     in_ADDRESS_INST_IFETCH_PTR            ;
-        delete     in_ADDRESS_BRANCH_STATE               ;
-        if (_param->_have_port_depth)
-        delete     in_ADDRESS_BRANCH_UPDATE_PREDICTION_ID;
-        delete [] out_DECOD_VAL                          ;
-        delete []  in_DECOD_ACK                          ;
-        delete [] out_DECOD_INSTRUCTION                  ;
-        delete    out_DECOD_ADDRESS                      ;
-        if (_param->_have_port_inst_ifetch_ptr)
-        delete    out_DECOD_INST_IFETCH_PTR              ;
-        delete    out_DECOD_BRANCH_STATE                 ;
-        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_ifetch_queue_ptr)
-        delete     in_ICACHE_RSP_PACKET_ID               ;
-        delete []  in_ICACHE_RSP_INSTRUCTION             ;
-        delete     in_ICACHE_RSP_ERROR                   ;
-        delete     in_EVENT_RESET_VAL                    ;
-        delete    out_EVENT_RESET_ACK                    ;
+        DELETE0_SIGNAL( in_ADDRESS_VAL                        ,1);
+        DELETE0_SIGNAL(out_ADDRESS_ACK                        ,1);
+        DELETE0_SIGNAL( in_ADDRESS_INSTRUCTION_ADDRESS        ,_param->_size_instruction_address);
+        DELETE0_SIGNAL( in_ADDRESS_INST_IFETCH_PTR            ,_param->_size_inst_ifetch_ptr);
+        DELETE0_SIGNAL( in_ADDRESS_BRANCH_STATE               ,_param->_size_branch_state   );
+        DELETE0_SIGNAL( in_ADDRESS_BRANCH_UPDATE_PREDICTION_ID,_param->_size_depth          );
+        DELETE0_SIGNAL(out_ADDRESS_IFETCH_QUEUE_ID            ,_param->_size_ifetch_queue_ptr);
+        DELETE1_SIGNAL( in_ADDRESS_INSTRUCTION_ENABLE         ,1,_param->_nb_instruction);
+      
+        DELETE1_SIGNAL(out_DECOD_VAL                        ,1,_param->_nb_instruction);
+        DELETE1_SIGNAL( in_DECOD_ACK                        ,1,_param->_nb_instruction);
+        DELETE1_SIGNAL(out_DECOD_INSTRUCTION                ,_param->_size_instruction,_param->_nb_instruction);
+        DELETE0_SIGNAL(out_DECOD_ADDRESS                    ,_param->_size_instruction_address);
+        DELETE0_SIGNAL(out_DECOD_INST_IFETCH_PTR            ,_param->_size_inst_ifetch_ptr );
+        DELETE0_SIGNAL(out_DECOD_BRANCH_STATE               ,_param->_size_branch_state    );
+        DELETE0_SIGNAL(out_DECOD_BRANCH_UPDATE_PREDICTION_ID,_param->_size_depth           );
+        DELETE0_SIGNAL(out_DECOD_EXCEPTION                  ,_param->_size_exception_ifetch);
+
+        DELETE0_SIGNAL( in_ICACHE_RSP_VAL        ,1);
+        DELETE0_SIGNAL(out_ICACHE_RSP_ACK        ,1);
+        DELETE0_SIGNAL( in_ICACHE_RSP_PACKET_ID  ,_param->_size_ifetch_queue_ptr);
+        DELETE0_SIGNAL( in_ICACHE_RSP_ERROR      ,_param->_size_icache_error);
+        DELETE1_SIGNAL( in_ICACHE_RSP_INSTRUCTION,_param->_size_instruction,_param->_nb_instruction);
+
+        DELETE0_SIGNAL( in_EVENT_RESET_VAL,1);
+        DELETE0_SIGNAL(out_EVENT_RESET_ACK,1);
       }
 
@@ -62 +60 @@
     if (usage_is_set(_usage,USE_SYSTEMC))
       {
-        delete    internal_DECOD_VAL;
+        DELETE1(internal_DECOD_VAL,_param->_nb_instruction);
+       
+        for (uint32_t i=0;i<_param->_size_queue; i++)
+          delete _queue[i];
         delete [] _queue;
       }