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

Timestamp:

Jun 17, 2009, 2:11:25 PM (15 years ago)

Author:

rosiere

Message:

1) Add test and configuration
2) Fix Bug
3) Add log file in load store unit
4) Fix Bug in environment

File:

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

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

@@ -32 +32 @@
       uint32_t nb_scan_bank = 0; // last scan bank
       bool     can_continue = true;
+
+      uint32_t event_nb_inst  [_param->_nb_front_end][_param->_max_nb_context];
+      for (uint32_t i=0; i<_param->_nb_front_end; i++)
+        for (uint32_t j=0; j<_param->_nb_context [i]; j++)
+          event_nb_inst [i][j] = 0;
 
       // for each reexecute_port
@@ -59 +64 @@
                   // Read state
                   entry_t    * entry = _rob [num_bank].front();
+                  uint32_t     num_packet   = ((entry->ptr << _param->_shift_num_slot) | num_bank);
+                  Tcontext_t   front_end_id = entry->front_end_id;
+                  Tcontext_t   context_id   = entry->context_id  ;
+
                   rob_state_t  state = entry->state;
                   
@@ -73 +82 @@
                             );
                   
-                  can_continue &= ((state == ROB_STORE_OK          ) or
-                                   (state == ROB_STORE_OK_WAIT_END ) or
-                                   (state == ROB_END_OK_SPECULATIVE) or
-                                   (state == ROB_END_OK            ) or
-                                   (state == ROB_END               )
+                  can_continue &= (((state == ROB_STORE_OK          ) or
+                                    (state == ROB_STORE_OK_WAIT_END ) or
+                                    (state == ROB_END_OK_SPECULATIVE) or
+                                    (state == ROB_END_OK            ) or
+                                    (state == ROB_END               )) and
+                                   not ((reg_EVENT_STATE [front_end_id][context_id] == COMMIT_EVENT_STATE_NOT_YET_EVENT) and
+                                        (reg_EVENT_PACKET[front_end_id][context_id] == num_packet)) and
+                                   not ((reg_EVENT_NB_INST [front_end_id][context_id] > 0) and
+                                        ((++event_nb_inst [front_end_id][context_id]) >= reg_EVENT_NB_INST [front_end_id][context_id]))
                                    );