Changeset 62 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp

Timestamp:

Dec 4, 2007, 2:31:54 PM (17 years ago)

Author:

rosiere

Message:

Modification en profondeur de Component-port_map.
Compilation ok pour Register_unit ... a tester (systemC et vhdl)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp

@@ -57 +57 @@
             //  others in speculation_access_queue
 
-            Toperation_t    operation           = PORT_READ(in_MEMORY_IN_OPERATION);
-            Tgeneral_data_t address             = (PORT_READ(in_MEMORY_IN_IMMEDIAT) +
-                                                   PORT_READ(in_MEMORY_IN_DATA_RA ));
-            
-            bool            exception_alignement= (mask_memory_access(operation) & address) != 0;
+            Toperation_t    operation            = PORT_READ(in_MEMORY_IN_OPERATION);
+            Tgeneral_data_t address              = (PORT_READ(in_MEMORY_IN_IMMEDIAT) +
+                                                    PORT_READ(in_MEMORY_IN_DATA_RA ));
+            bool            exception_alignement = (mask_memory_access(operation) & address) != 0;
                                                     
             if (is_operation_memory_store(operation) == true)
@@ -159 +158 @@
                     _store_queue [index]._context_id           = PORT_READ(in_MEMORY_IN_CONTEXT_ID  );
                     _store_queue [index]._packet_id            = PORT_READ(in_MEMORY_IN_PACKET_ID   );
-#ifdef HAVE_MEMORY_OUT_OPERATION
-                    _store_queue [index]._operation            = operation;
-#endif
-#ifdef HAVE_MEMORY_OUT_TYPE
-                    _store_queue [index]._type                 = PORT_READ(in_MEMORY_IN_TYPE        );
-#endif
+                    _store_queue [index]._dcache_type          = operation_to_dcache_type(operation);
+                    _store_queue [index]._uncached             = 0; // is the MMU that have this info
                     _store_queue [index]._load_queue_ptr_write = PORT_READ(in_MEMORY_IN_LOAD_QUEUE_PTR_WRITE);
                     _store_queue [index]._address              = address;
@@ -217 +212 @@
               }
           }
+
+        //================================================================
+        // Interface "DCACHE_REQ"
+        //================================================================
+        if ((    internal_DCACHE_REQ_VAL  == 1) and
+            (PORT_READ(in_DCACHE_REQ_ACK) == 1))
+          {
+            switch (internal_DCACHE_REQ_SELECT_QUEUE)
+              {
+              case SELECT_STORE_QUEUE :
+                {
+                  // =======================
+                  // ===== STORE_QUEUE =====
+                  // =======================
+                  
+                  // Entry flush and increase the read pointer
+                  
+                  _store_queue [internal_MEMORY_STORE_QUEUE_PTR_READ]._state = STORE_QUEUE_COMMIT;
+
+                  break;
+                }
+              case SELECT_LOAD_QUEUE :
+              case SELECT_LOAD_QUEUE_SPECULATIVE :
+                break;
+              }
+          }
+
+#if DEBUG>=DEBUG_TRACE
+        // ***** dump store queue
+        cout << "Dump store queue" << endl
+             << "ptr_read : " << toString(static_cast<uint32_t>(internal_MEMORY_STORE_QUEUE_PTR_READ)) << endl;
+        
+        for (uint32_t i=0; i<_param->_size_store_queue; i++)
+          {
+            uint32_t j = (internal_MEMORY_STORE_QUEUE_PTR_READ+i)%_param->_size_store_queue;
+            cout << "{" << j << "}" << endl
+                 << _store_queue[j] << endl;
+          }
+#endif
       }