Changeset 97 for trunk/IPs/systemC/processor/Morpheo/Common/src

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

Location:

trunk/IPs/systemC/processor/Morpheo/Common/src

Files:

• Debug.cpp (modified) (1 diff)
• Environment.cpp (modified) (1 diff)
• Message.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Common/src/Debug.cpp

@@ -11 +11 @@
 namespace morpheo {
 
-static uint32_t _debug_depth = 0;
+#ifdef DEBUG
+static bool       debug_initialized;
+#endif
+debug_verbosity_t debug;
 
 #undef  FUNCTION
-#define FUNCTION "debug_tab"
-std::string debug_tab (void)
+#define FUNCTION "debug_init"
+void debug_init (void)
 {
-  return std::string(_debug_depth,'\t');
+#ifdef DEBUG
+  if (not debug_initialized)
+    {
+      debug = DEBUG;
+
+//       debug_initialized = true;
+    }
+#endif
 }
 
 #undef  FUNCTION
-#define FUNCTION "debug_tab_inc"
-void debug_tab_inc (void)
+#define FUNCTION "debug_init"
+void debug_init (debug_verbosity_t level)
 {
-//   _debug_depth ++;
-}
-
-#undef  FUNCTION
-#define FUNCTION "debug_tab_dec"
-void debug_tab_dec (void)
-{
-//   _debug_depth --;
+#ifdef DEBUG
+  if (not debug_initialized)
+    {
+      // Take min
+      debug = (level < DEBUG)?level:DEBUG;
+      
+      debug_initialized = true;
+    }
+#endif
 }
 

trunk/IPs/systemC/processor/Morpheo/Common/src/Environment.cpp

@@ -9 +9 @@
 #include "Common/include/ErrorMorpheo.h"
 #include "Common/include/Debug.h"
+#include "Common/include/Message.h"
 #include <sys/stat.h>
 

trunk/IPs/systemC/processor/Morpheo/Common/src/Message.cpp

@@ -1 @@
-#ifdef LOG_FILE
 /*
  * $Id$
@@ -16 +15 @@
 namespace morpheo {
 
-static bool log_initialized;
-FILE * log_stream;
-
+  static bool log_initialized;
+  FILE * log_stream;
+  
+#undef  FUNCTION
+#define FUNCTION "log"
+  FILE * log (FILE * stream)
+  {
+    // if log stream is initialized, take this, else return the default stream.
+    return (log_initialized and (log_stream!=NULL))?log_stream:stream;
+  };
+  
 #undef  FUNCTION
 #define FUNCTION "log_init"
-void log_init (void)
-{
-  if (not log_initialized)
-    {
-      log_initialized = true;
-
-      directory();
-      
-      std::string filename = MORPHEO_LOG+"/Morpheo_"+toString<pid_t>(getpid())+".log";
-
-      log_stream = fopen (filename.c_str(), "w");
-
-      if (log_stream==NULL)
-        {
-          fprintf(stderr,_("%s Error create log file \"%s\", take the standard output.\n"),MSG_ERROR,filename.c_str());
-          log_stream = stdout;
-        }
-      else
-        {
-          fprintf(stdout,_("%s Create log file \"%s\".\n"),MSG_INFORMATION,filename.c_str());
-        }
-    }
-}
-
+  void log_init (bool        have_file,
+                 std::string directory,
+                 std::string file)
+  {
+    if (not log_initialized)
+      {
+        log_initialized = true;
+        
+        if (have_file)
+          {
+            // if the file is not define, take pid.
+            std::string filename = directory+"/Morpheo_"+((file!="")?file:toString<pid_t>(getpid()))+".log";
+            
+            log_stream = fopen (filename.c_str(), "w");
+            
+            if (log_stream==NULL)
+              {
+                fprintf(stderr,_("%s Error create log file \"%s\", take the standard output.\n"),MSG_ERROR,filename.c_str());
+                log_stream = stdout;
+              }
+            else
+              {
+                fprintf(stdout,_("%s Create log file \"%s\".\n"),MSG_INFORMATION,filename.c_str());
+              }
+          }
+        else
+          {
+            log_stream = NULL;
+          }
+      }
+  }
+  
 }; // end namespace morpheo
-#endif