Changeset 104 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp

Timestamp:

Jan 21, 2009, 10:53:13 PM (15 years ago)

Author:

rosiere

Message:

Fix Bug :
1) Load Store Unit : check big endian
2) Commit unit & RAT : add retire_event interface

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp

@@ -67 +67 @@
         DELETE2_SIGNAL(out_RETIRE_CONTEXT_ID              ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_context_id            );    
 //      DELETE2_SIGNAL(out_RETIRE_RENAME_UNIT_ID          ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_rename_unit_id        );
-        DELETE2_SIGNAL(out_RETIRE_EVENT_STATE             ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_event_state           );
         DELETE2_SIGNAL(out_RETIRE_USE_STORE_QUEUE         ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1                                   );
         DELETE2_SIGNAL(out_RETIRE_USE_LOAD_QUEUE          ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1                                   );
@@ -87 +86 @@
         DELETE2_SIGNAL(out_RETIRE_NUM_REG_RE_PHY_NEW      ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_special_register      );
 
+        DELETE2_SIGNAL(out_RETIRE_EVENT_VAL               ,_param->_nb_front_end,_param->_nb_context[it1],1);
+        DELETE2_SIGNAL( in_RETIRE_EVENT_ACK               ,_param->_nb_front_end,_param->_nb_context[it1],1);
+        DELETE2_SIGNAL(out_RETIRE_EVENT_STATE             ,_param->_nb_front_end,_param->_nb_context[it1],_param->_size_event_state);
+
         DELETE1_SIGNAL( in_COMMIT_VAL               ,_param->_nb_inst_commit,1                             );
         DELETE1_SIGNAL(out_COMMIT_ACK               ,_param->_nb_inst_commit,1                             );
@@ -156 +159 @@
 
         // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~     
-        delete [] internal_BANK_INSERT_VAL            ;
-        delete [] internal_BANK_INSERT_NUM_RENAME_UNIT;
-        delete [] internal_BANK_INSERT_NUM_INST       ;
-        
-        delete [] internal_BANK_COMMIT_VAL            ;
-        delete [] internal_BANK_COMMIT_NUM_INST       ;
-        delete [] internal_BANK_COMMIT_ENTRY          ;
-        
-        delete [] internal_BANK_RETIRE_VAL            ;
-        delete [] internal_BANK_RETIRE_NUM_RENAME_UNIT;
-        delete [] internal_BANK_RETIRE_NUM_INST       ;
-        
-        delete [] internal_REEXECUTE_VAL              ;
-        delete [] internal_REEXECUTE_NUM_BANK         ;
-        
-        delete [] internal_BRANCH_COMPLETE_VAL        ;
-        delete [] internal_BRANCH_COMPLETE_NUM_BANK   ;
-        
-        for (uint32_t i=0; i<_param->_nb_front_end; i++)
-          delete [] internal_EVENT_ACK [i];
-        delete [] internal_EVENT_ACK;
+        DELETE1(internal_BANK_INSERT_VAL             ,_param->_nb_bank);
+        DELETE1(internal_BANK_INSERT_NUM_RENAME_UNIT ,_param->_nb_bank);
+        DELETE1(internal_BANK_INSERT_NUM_INST        ,_param->_nb_bank);
+        
+        DELETE2(internal_BANK_COMMIT_VAL             ,_param->_nb_bank,_param->_nb_bank_access_commit);
+        DELETE2(internal_BANK_COMMIT_NUM_INST        ,_param->_nb_bank,_param->_nb_bank_access_commit);
+        DELETE2(internal_BANK_COMMIT_ENTRY           ,_param->_nb_bank,_param->_nb_bank_access_commit);
+        
+        DELETE1(internal_BANK_RETIRE_VAL             ,_param->_nb_bank);
+        DELETE1(internal_BANK_RETIRE_NUM_RENAME_UNIT ,_param->_nb_bank);
+        DELETE1(internal_BANK_RETIRE_NUM_INST        ,_param->_nb_bank);
+        
+        DELETE1(internal_REEXECUTE_VAL               ,_param->_nb_inst_reexecute);
+        DELETE1(internal_REEXECUTE_NUM_BANK          ,_param->_nb_inst_reexecute);
+        
+        DELETE1(internal_BRANCH_COMPLETE_VAL         ,_param->_nb_inst_branch_complete);
+        DELETE1(internal_BRANCH_COMPLETE_NUM_BANK    ,_param->_nb_inst_branch_complete);
+        
+        DELETE2(internal_EVENT_ACK                   ,_param->_nb_front_end,_param->_nb_context [it1]);
+        
+        DELETE2(internal_RETIRE_EVENT_VAL            ,_param->_nb_front_end,_param->_nb_context[it1]);
         
         // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-        DELETE1(_rob                   ,_param->_nb_bank);
-        DELETE1(reg_BANK_PTR           ,_param->_nb_bank);
-        DELETE2(reg_NB_INST_COMMIT_ALL ,_param->_nb_front_end,_param->_nb_context [it1]);
-        DELETE2(reg_NB_INST_COMMIT_MEM ,_param->_nb_front_end,_param->_nb_context [it1]);
-        DELETE2(reg_EVENT_STATE        ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE1(_rob                     ,_param->_nb_bank);
+        DELETE1(reg_BANK_PTR             ,_param->_nb_bank);
+        DELETE2(reg_NB_INST_COMMIT_ALL   ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_NB_INST_COMMIT_MEM   ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_EVENT_STATE          ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_EVENT_FLUSH          ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_PC_PREVIOUS          ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_PC_CURRENT           ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_PC_CURRENT_IS_DS     ,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_PC_CURRENT_IS_DS_TAKE,_param->_nb_front_end,_param->_nb_context [it1]);
+        DELETE2(reg_PC_NEXT              ,_param->_nb_front_end,_param->_nb_context [it1]);
       }
 
@@ -199 +208 @@
 }; // end namespace multi_ooo_engine
 }; // end namespace core
-
 }; // end namespace behavioural
 }; // end namespace morpheo