Changeset 62 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Types.h

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/include/Types.h (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Types.h

@@ -56 +56 @@
   public    : Tcontext_t           _context_id          ;
   public    : Tpacket_t            _packet_id           ;
-  public    : Taccess_t            _access              ;
+  public    : Tdcache_type_t       _dcache_type         ;
   public    : Tcontrol_t           _uncached            ;
-#ifdef HAVE_MEMORY_OUT_OPERATION
-  public    : Toperation_t         _operation           ;
-#endif                             
-#ifdef HAVE_MEMORY_OUT_TYPE                           
-  public    : Ttype_t              _type                ;
-#endif                             
   public    : Tlsq_ptr_t           _load_queue_ptr_write;
   public    : Tdcache_data_t       _address             ;
@@ -70 +64 @@
 //public    : Tgeneral_address_t   _num_reg_rd          ;
   public    : Texception_t         _exception           ;
+
+    friend ostream & operator << (ostream& os, const Tstore_queue_entry_t & x) 
+    {
+      return os << " * state                   : " << x._state << endl
+                << "   * packet   - context_id : " << toString(static_cast<uint32_t>(x._packet_id           )) << " - " << toString(static_cast<uint32_t>(x._context_id)) << endl
+                << "   * type     - uncached   : " << toString(static_cast<uint32_t>(x._dcache_type         )) << " - " << toString(static_cast<uint32_t>(x._uncached  )) << endl
+                << "   * load_ptr - execption  : " << toString(static_cast<uint32_t>(x._load_queue_ptr_write)) << " - " << toString(static_cast<uint32_t>(x._exception )) << endl
+                << "   * address  - wdata      : " << toString(static_cast<uint32_t>(x._address             )) << " - " << toString(static_cast<uint32_t>(x._wdata     )) << endl;
+    }
   };
+  
+  
 
   // ----------------------------------------------------------
@@ -91 +96 @@
   public    : Tcontrol_t                         _uncached             ;
   public    : Tcontrol_t                         _sign_extension       ;
-#ifdef HAVE_MEMORY_OUT_OPERATION                                       
-  public    : Toperation_t                       _operation            ;
-#endif                                                                 
-#ifdef HAVE_MEMORY_OUT_TYPE                                            
-  public    : Ttype_t                            _type                 ;
-#endif                                                                 
   public    : Tlsq_ptr_t                         _load_queue_ptr_write ;
   public    : Tlsq_ptr_t                         _store_queue_ptr_write;
@@ -128 +127 @@
   public    : Tcontrol_t           _uncached            ;
   public    : Tcontrol_t           _sign_extension      ;
-#ifdef HAVE_MEMORY_OUT_OPERATION
-  public    : Toperation_t         _operation           ;
-#endif                             
-#ifdef HAVE_MEMORY_OUT_TYPE                           
-  public    : Ttype_t              _type                ;
-#endif                             
   public    : Tlsq_ptr_t           _store_queue_ptr_write;
   public    : Tdcache_address_t    _address             ;