Changeset 146 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include

Timestamp:

Feb 1, 2011, 9:57:54 PM (14 years ago)

Author:

rosiere

Message:

1) Integration of RegisterFile_Internal_Banked in RegisterFile?
2) Erase "read_write" interface in RegisterFile_Monolithic component
3) Add smith predictor parameters in Load_store_pointer_unit.
4) Fix not statistics flags

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/include

Files:

• Allocation.h (modified) (1 diff)
• Stat_binary_tree.h (modified) (2 diffs)
• Stat_type.h (modified) (3 diffs)
• Types.h (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h

@@ -141 +141 @@
     } while (0)
 
-#define DELETE0(var)             DELETE1_COND(var,true)
+#define DELETE0(var)             DELETE0_COND(var,true)
 #define DELETE1(var,s1)          DELETE1_COND(var,s1,true)
 #define DELETE2(var,s1,s2)       DELETE2_COND(var,s1,s2,true)

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_binary_tree.h

@@ -1 @@
-#ifdef STATISTICS
+//#ifdef STATISTICS
 #ifndef morpheo_behavioural_Stat_binary_tree_h
 #define morpheo_behavioural_Stat_binary_tree_h
@@ -72 +72 @@
 };
 #endif
-#endif
+//#endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_type.h

@@ -1 @@
-#ifdef STATISTICS
 #ifndef morpheo_behavioural_Stat_type_h
 #define morpheo_behavioural_Stat_type_h
@@ -12 +11 @@
 namespace behavioural {
 
-  typedef enum{TYPE_VARIABLE, TYPE_COUNTER} counter_type_t;
-
   typedef double counter_t ;
 
   typedef enum{add, sub, mul, div, inc, dec} operator_t;
+
+#ifdef STATISTICS
+
+  typedef enum{TYPE_VARIABLE, TYPE_COUNTER} counter_type_t;
 
 //typedef std::pair<operator_t, std::string> pair_operator_string_t;
@@ -79 +80 @@
   };
 
+#endif
+
 };
 };
 #endif
-#endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h

@@ -114 +114 @@
 
   typedef enum
+  {
+    PHT_SCHEME_COUNTER,
+    PHT_SCHEME_FSM
+  } Tpht_scheme_t;
+  
+  typedef enum
     {
       MANAGE_EVENT_WAIT_ALL,
@@ -314 +320 @@
   };
 
+
+  template<> inline std::string toString<morpheo::behavioural::Tpht_scheme_t>(const morpheo::behavioural::Tpht_scheme_t& x)
+  {
+    switch (x)
+      {
+      case morpheo::behavioural::PHT_SCHEME_COUNTER : return "counter"; break;
+      case morpheo::behavioural::PHT_SCHEME_FSM     : return "fsm"    ; break;
+      default : return ""; break;
+      }
+  };
+
+  template<> inline morpheo::behavioural::Tpht_scheme_t fromString<morpheo::behavioural::Tpht_scheme_t>(const std::string& x)
+  {
+    if ( (x.compare(toString(static_cast<uint32_t>(morpheo::behavioural::PHT_SCHEME_COUNTER  ))) == 0) or
+         (x.compare(toString(                      morpheo::behavioural::PHT_SCHEME_COUNTER   )) == 0))
+      return morpheo::behavioural::PHT_SCHEME_COUNTER;
+    if ( (x.compare(toString(static_cast<uint32_t>(morpheo::behavioural::PHT_SCHEME_FSM))) == 0) or
+         (x.compare(toString(                      morpheo::behavioural::PHT_SCHEME_FSM )) == 0))
+      return morpheo::behavioural::PHT_SCHEME_FSM;
+    
+    throw (ErrorMorpheo ("<fromString> : Unknow string : \""+x+"\""));
+  };
+
+
   template<> inline std::string toString<morpheo::behavioural::Trat_scheme_t>(const morpheo::behavioural::Trat_scheme_t& x)
   {