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

Timestamp:

Dec 10, 2008, 7:31:39 PM (15 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

File:

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

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

@@ -1 @@
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef Morpheo_Debug_h
+#define Morpheo_Debug_h
 
 /*
@@ -13 +13 @@
  *  - log_begin
  *  - log_end
+ *  - log_function
+ *  - msg_print
  *  - breakpoint
  *
@@ -25 +27 @@
 #include "Common/include/Message.h"
 #include "Behavioural/include/Debug_component.h"
-#include "Behavioural/include/Environment.h"
+#include <systemc.h>
 #include <stdio.h>
 #include <string.h>
@@ -31 +33 @@
 #include <sstream>
 #include <string>
+
+namespace morpheo {
 
 enum _debug_verbosity 
@@ -54 +58 @@
            ( DEBUG_ ## component == true )) )                           \
         {                                                               \
+          if (DEBUG_ ## level <= DEBUG_INFO)                            \
+            {                                                           \
+              msg("%s ",MSG_INFORMATION);                               \
+            }                                                           \
+          else                                                          \
+            {                                                           \
+              msg("%s ",MSG_DEBUG);                                     \
+            }                                                           \
+                                                                        \
           if (DEBUG >= DEBUG_FUNC)                                      \
             {                                                           \
-              msg(_("%s"),debug_tab().c_str());                         \
+              msg("%s",debug_tab().c_str());                            \
             }                                                           \
           if (DEBUG >= DEBUG_ALL )                                      \
@@ -72 +85 @@
           if (DEBUG >= DEBUG_FUNC)                                      \
             {                                                           \
-              msg(_("<%s> "),func);                                     \
-              msg(_("In file %s, "),__FILE__);                          \
-              msg(_("at line %d " ),__LINE__);                          \
-              msg(_(": "));                                             \
-            }                                                           \
-          msg(str);                                                     \
-          msg(_("\n"));                                                 \
-          fflush (stdout);                                              \
+              msg(  "<%s> " ,func);                                     \
+              msg(_("In file %s, "),__FILE__);                          \
+              msg(_("at line %d " ),__LINE__);                          \
+              msg(  ": " );                                             \
+            }                                                           \
+          msg(str);                                                     \
+          msg("\n");                                                    \
         }                                                               \
     } while(0)
@@ -87 +99 @@
     {                                                                   \
       debug_tab_inc ();                                                 \
-      log_printf(FUNC,component,func,"Begin");                          \
+      log_printf(FUNC,component,func,_("Begin"));                       \
     } while(0)
 
@@ -93 +105 @@
   do                                                                    \
     {                                                                   \
-      log_printf(FUNC,component,func,"End");                            \
+      log_printf(FUNC,component,func,_("End"));                         \
       debug_tab_dec ();                                                 \
     } while(0)
@@ -115 +127 @@
 #endif // DEBUG
 
+# define log_function(component,func,name)                              \
+  do                                                                    \
+    {                                                                   \
+      log_printf(TRACE,component,func,_("[%d] %s.%s"),static_cast<uint32_t>(sc_simulation_time()),name,func); \
+    } while(0)
+
+
+#define msg_printf(type,str...)                                         \
+  do                                                                    \
+    {                                                                   \
+      msg("%s ",MSG_ ## type);                                          \
+      msg(str);                                                         \
+      msg("\n");                                                        \
+    } while(0)
+
+
 #define breakpoint(str...)                                              \
   do                                                                    \
     {                                                                   \
-      msg(_("Breakpoint : file %s, line %d. Enter Any key to continue\n"),__FILE__,__LINE__); \
-      msg(str);                                                         \
+      fprintf(stdout,_("%s "),MSG_BREAKPOINT);                                     \
+      fprintf(stdout,_("Breakpoint in file %s, line %d.\n"),__FILE__,__LINE__);    \
+      fprintf(stdout,_("%s "),MSG_NONE);                                           \
+      fprintf(stdout,str);                                                              \
+      fprintf(stdout,_("\n"));                                                     \
+      fprintf(stdout,_("%s "),MSG_NONE);                                           \
+      fprintf(stdout,_("Enter any key to continue\n"));                            \
       getchar();                                                        \
     } while(0)
@@ -128 +161 @@
     {                                                                   \
       if (x == NULL)                                                    \
-        err(_("%s File %s, Line %d, this pointeur is null\n"),MSG_ERROR,__FILE__,__LINE__); \
+        err(_("File %s, Line %d, this pointeur is null\n"),__FILE__,__LINE__); \
     }                                                                   \
   while (0)
@@ -139 +172 @@
 #endif
 
-
+}; // end namespace morpheo
 #endif // !DEBUG_H