Changeset 97 for trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h

Timestamp:

Dec 19, 2008, 4:34:00 PM (16 years ago)

Author:

rosiere

Message:

1) Update Prediction Table : statistics
2) Size instruction address on 30 bits
3) Change Log File
4) Add debug_level in simulation configuration file

File:

• trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h (modified) (9 diffs)

trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h

@@ -9 +9 @@
  * function to help the debugging :
  *
- *  - debug_tab
  *  - log_printf
  *  - log_begin
@@ -26 +25 @@
 
 #include "Common/include/Message.h"
+#include "Common/include/FromString.h"
+#include "Common/include/ChangeCase.h"
 #include "Behavioural/include/Debug_component.h"
 #include <systemc.h>
@@ -36 +37 @@
 namespace morpheo {
 
-enum _debug_verbosity 
+typedef enum 
   {
     DEBUG_NONE ,
@@ -43 +44 @@
     DEBUG_FUNC ,
     DEBUG_ALL
-  };
-
-std::string debug_tab     (void);
-void        debug_tab_inc (void);
-void        debug_tab_dec (void);
-
+  } debug_verbosity_t;
+
+  extern debug_verbosity_t debug;
+
+void        debug_init    (void);
+void        debug_init    (debug_verbosity_t level);
 #ifdef DEBUG
+
 # define log_printf(level, component, func, str... )                    \
   do                                                                    \
     {                                                                   \
-      if ((DEBUG == DEBUG_ALL ) or                                      \
+      debug_init();                                                     \
+                                                                        \
+      if ((debug == DEBUG_ALL ) or                                      \
           (DEBUG_ ## level == DEBUG_NONE) or                            \
-          (( DEBUG_ ## level     <= DEBUG) and                          \
+          (( DEBUG_ ## level     <= debug) and                          \
            ( DEBUG_ ## component == true )) )                           \
         {                                                               \
@@ -67 +71 @@
             }                                                           \
                                                                         \
-          if (DEBUG >= DEBUG_FUNC)                                      \
-            {                                                           \
-              msg("%s",debug_tab().c_str());                            \
-            }                                                           \
-          if (DEBUG >= DEBUG_ALL )                                      \
+          if (debug >= DEBUG_ALL )                                      \
             {                                                           \
               switch (DEBUG_ ## level)                                  \
@@ -83 +83 @@
                 }                                                       \
             }                                                           \
-          if (DEBUG >= DEBUG_FUNC)                                      \
+          if (debug >= DEBUG_FUNC)                                      \
             {                                                           \
               msg(  "<%s> " ,func);                                     \
@@ -98 +98 @@
   do                                                                    \
     {                                                                   \
-      debug_tab_inc ();                                                 \
       log_printf(FUNC,component,func,_("Begin"));                       \
     } while(0)
@@ -106 +105 @@
     {                                                                   \
       log_printf(FUNC,component,func,_("End"));                         \
-      debug_tab_dec ();                                                 \
     } while(0)
 
@@ -172 +170 @@
 #endif
 
+
+  template<> inline debug_verbosity_t fromString<debug_verbosity_t> (const std::string& x)
+  {
+    std::string y=x;
+    LowerCase(y);
+
+    if ( (y.compare("0")     == 0) or
+         (y.compare("none")  == 0))
+      return DEBUG_NONE ;
+    if ( (y.compare("1")     == 0) or
+         (y.compare("info")  == 0))
+      return DEBUG_INFO ;
+    if ( (y.compare("2")     == 0) or
+         (y.compare("trace") == 0))
+      return DEBUG_TRACE;
+    if ( (y.compare("3")     == 0) or
+         (y.compare("func")  == 0))
+      return DEBUG_FUNC ;
+    if ( (y.compare("4")     == 0) or
+         (y.compare("all")   == 0))
+      return DEBUG_ALL  ;
+
+#ifdef DEBUG
+    return DEBUG;
+#else
+    return DEBUG_NONE ;
+#endif
+  }
+
 }; // end namespace morpheo
 #endif // !DEBUG_H