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

Timestamp:

May 21, 2009, 12:01:32 AM (15 years ago)

Author:

rosiere

Message:

1) Stat List : scan all queue to find free register
2) Write_queue : test "genMealy" add bypass [0]
3) Functionnal_unit : add const parameters to add or not the pipeline_in
4) Load Store Unit : if load make an exception, free nb_check
5) Debug, change test to add model

File:

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

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

@@ -28 +28 @@
     // ===================================================================
     {
+      log_printf(TRACE,Commit_unit,FUNCTION,"  * REEXECUTE [0]");
+
       // Store instruction comming Out Of Order in Load Store Unit. 
       // Must be executed in no speculative mode. Also, send a signal when an Store is in head of ROB
 
-      Tcontrol_t val = false;
-
-      if (not _rob[reg_NUM_BANK_HEAD].empty())
-        {
-          entry_t    * entry = _rob [reg_NUM_BANK_HEAD].front();
+      Tcontrol_t val      = false;
+      uint32_t   num_bank = reg_NUM_BANK_HEAD;
+
+      if (not _rob[num_bank].empty())
+        {
+          log_printf(TRACE,Commit_unit,FUNCTION,"    * ROB is not empty");
+          log_printf(TRACE,Commit_unit,FUNCTION,"    * num_bank      : %d",num_bank);
+
+          entry_t    * entry = _rob [num_bank].front();
           rob_state_t  state = entry->state;
 
@@ -41 +47 @@
           val   = ((state == ROB_STORE_HEAD_OK) or
                    (state == ROB_STORE_HEAD_KO));
-          
+
+          log_printf(TRACE,Commit_unit,FUNCTION,"    * val           : %d",val);
           if (val)
             {
+              Tpacket_t packet_id = ((entry->ptr << _param->_shift_num_slot) | num_bank);
+
+              log_printf(TRACE,Commit_unit,FUNCTION,"    * packet_id     : %d",packet_id);
+          
               // Reexecute store
               if (_param->_have_port_context_id)
@@ -50 +61 @@
               PORT_WRITE(out_REEXECUTE_FRONT_END_ID          [0], entry->front_end_id         );
               if (_param->_have_port_rob_ptr  )
-              PORT_WRITE(out_REEXECUTE_PACKET_ID             [0], entry->ptr                  );
+              PORT_WRITE(out_REEXECUTE_PACKET_ID             [0], packet_id                   );
               PORT_WRITE(out_REEXECUTE_TYPE                  [0], entry->type                 );
               PORT_WRITE(out_REEXECUTE_STORE_QUEUE_PTR_WRITE [0], entry->store_queue_ptr_write);
@@ -58 +69 @@
  
       internal_REEXECUTE_VAL      [0] = val;
-      internal_REEXECUTE_NUM_BANK [0] = reg_NUM_BANK_HEAD;
+      internal_REEXECUTE_NUM_BANK [0] = num_bank;
       
       PORT_WRITE(out_REEXECUTE_VAL[0], internal_REEXECUTE_VAL [0]);