Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h	(revision 78)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h	(revision 81)
@@ -16,52 +16,54 @@
 
   // ***** general
-  typedef uint32_t        Tinstruction_t;
-  typedef bool            Tcontrol_t;
-  typedef uint8_t         Toperation_t;
-//typedef uint32_t        Tdestination1_t;
-//typedef uint32_t        Tdestination2_t;
-//typedef uint32_t        Texec_flag_t;
-//typedef bool            Texec_excep_t;
-			  
-  typedef uint8_t         Texception_t;
-  typedef uint8_t         Tcontext_t;
-  typedef uint8_t         Tpacket_t;
-  typedef uint8_t         Ttype_t;
-  typedef uint8_t         Tevent_state_t;
-  typedef uint8_t         Tevent_type_t;
-  typedef uint8_t         Tcounter_t; // universal counter
-  typedef uint8_t         Tptr_t;     // universal pointer
-			  
-  // ***** Register	  
-  typedef uint32_t        Tgeneral_address_t;
-  typedef uint32_t        Tgeneral_data_t;
-  typedef uint32_t        Tspecial_address_t;
-  typedef uint32_t        Tspecial_data_t;
+  typedef uint32_t           Tinstruction_t;
+  typedef bool               Tcontrol_t;
+  typedef uint8_t            Texception_t;
+  typedef uint8_t            Tcontext_t;
+  typedef uint8_t            Tpacket_t;
+  typedef uint8_t            Toperation_t;
+  typedef uint8_t            Ttype_t;
+  typedef uint8_t            Tcounter_t; // universal counter
+  typedef uint8_t            Tptr_t;     // universal pointer
+			     
+//typedef uint32_t           Tdestination1_t;
+//typedef uint32_t           Tdestination2_t;
+//typedef uint32_t           Texec_flag_t;
+//typedef bool               Texec_excep_t;
+			     
+  // ***** Event	     
+  typedef uint8_t            Tevent_state_t;
+  typedef uint8_t            Tevent_type_t;
+			     
+  // ***** Register	     
+  typedef uint32_t           Tgeneral_address_t;
+  typedef uint32_t           Tgeneral_data_t;
+  typedef uint32_t           Tspecial_address_t;
+  typedef uint32_t           Tspecial_data_t;
+			     
+  // ~~~~~ prediction_unit   
+  typedef uint8_t            Thistory_t;
+  typedef Tptr_t             Tprediction_ptr_t;
+  typedef uint8_t            Tbranch_state_t;
+  typedef uint8_t            Tbranch_condition_t;
+  typedef Tprediction_ptr_t  Tdepth_t;
+  typedef Tgeneral_data_t    Taddress_t;
 
   // ***** component dependant
   // ~~~~~ load store queue
-  typedef uint8_t         Taccess_t;
-  typedef uint8_t         Tlsq_ptr_t;
-  typedef uint32_t        Tdcache_address_t;
-  typedef uint32_t        Tdcache_data_t;
-  typedef bool            Tdcache_error_t;
-  typedef uint8_t         Tdcache_type_t;
-
-  // ~~~~~ prediction_unit
-  typedef uint8_t         Thistory_t;
-  typedef uint8_t         Tprediction_ptr_t;
-  typedef uint8_t         Tbranch_state_t;
-  typedef uint8_t         Tbranch_condition_t;
-  typedef uint8_t         Tdepth_t;      
-  typedef Tgeneral_data_t Taddress_t;
-
-
-  // ~~~~~ ifetch
-  typedef uint8_t         Tinst_ifetch_ptr_t;
-  typedef uint8_t         Tifetch_queue_ptr_t;
-  typedef uint32_t        Ticache_address_t;
-  typedef uint32_t        Ticache_instruction_t;
-  typedef bool            Ticache_error_t;
-  typedef uint8_t         Ticache_type_t;
+  typedef uint8_t            Taccess_t;
+  typedef Tptr_t             Tlsq_ptr_t;
+  typedef Tgeneral_address_t Tdcache_address_t;
+  typedef Tgeneral_data_t    Tdcache_data_t;
+  typedef bool               Tdcache_error_t;
+  typedef uint8_t            Tdcache_type_t;
+			     
+			     
+  // ~~~~~ ifetch	     
+  typedef Tptr_t             Tinst_ifetch_ptr_t;
+  typedef Tptr_t             Tifetch_queue_ptr_t;
+  typedef Tgeneral_address_t Ticache_address_t;
+  typedef Tgeneral_data_t    Ticache_instruction_t;
+  typedef bool               Ticache_error_t;
+  typedef uint8_t            Ticache_type_t;
 
   typedef enum
