Changeset 100 for trunk/IPs/systemC/processor/Morpheo/Common

Timestamp:

Jan 8, 2009, 2:06:27 PM (16 years ago)

Author:

rosiere

Message:

1) Bug fix (Operation, Instruction)
2) Modif Return Address Stack
3) Add Soft Test
4) Add Soc Test

Location:

trunk

Files:

• . (modified) (1 prop)
• IPs/systemC/processor/Morpheo/Common/include/Debug.h (modified) (2 diffs)
• IPs/systemC/processor/Morpheo/Common/include/Filename.h (added)
• IPs/systemC/processor/Morpheo/Common/src/Debug.cpp (modified) (4 diffs)
• IPs/systemC/processor/Morpheo/Common/src/Message.cpp (modified) (2 diffs)

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

@@ -47 +47 @@
 
   extern debug_verbosity_t debug;
-
-void        debug_init    (void);
-void        debug_init    (debug_verbosity_t level);
+  extern bool              debug_cycle_test;
+  extern double            debug_cycle_start;
+  extern double            debug_cycle_stop ;
+
+  void        debug_init    (void);
+  void        debug_init    (debug_verbosity_t level,
+                             double            cycle_start,
+                             double            cycle_stop );
+
+#ifdef SYSTEMC
+#define debug_test_simulation_time                                      \
+  (not debug_cycle_test or                                              \
+   ( (sc_simulation_time() >= debug_cycle_start) and                    \
+    ((sc_simulation_time() <= debug_cycle_stop) or                      \
+      (debug_cycle_stop == -1))))
+#else
+#define debug_test_simulation_time true
+#endif
+  
 #ifdef DEBUG
-
 # define log_printf(level, component, func, str... )                    \
   do                                                                    \
@@ -57 +72 @@
       debug_init();                                                     \
                                                                         \
-      if ((debug == DEBUG_ALL ) or                                      \
-          (DEBUG_ ## level == DEBUG_NONE) or                            \
-          (( DEBUG_ ## level     <= debug) and                          \
-           ( DEBUG_ ## component == true )) )                           \
-        {                                                               \
-          if (DEBUG_ ## level <= DEBUG_INFO)                            \
-            {                                                           \
-              msg("%s ",MSG_INFORMATION);                               \
-            }                                                           \
-          else                                                          \
-            {                                                           \
-              msg("%s ",MSG_DEBUG);                                     \
-            }                                                           \
+      if (debug_test_simulation_time)                                   \
+        if ((debug == DEBUG_ALL ) or                                    \
+            (DEBUG_ ## level == DEBUG_NONE) or                          \
+            (( DEBUG_ ## level     <= debug) and                        \
+             ( DEBUG_ ## component == true )) )                         \
+          {                                                             \
+            if (DEBUG_ ## level <= DEBUG_INFO)                          \
+              {                                                         \
+                msg("%s ",MSG_INFORMATION);                             \
+              }                                                         \
+            else                                                        \
+              {                                                         \
+                msg("%s ",MSG_DEBUG);                                   \
+              }                                                         \
                                                                         \
-          if (debug >= DEBUG_ALL )                                      \
-            {                                                           \
-              switch (DEBUG_ ## level)                                  \
-                {                                                       \
-                case DEBUG_NONE  : msg(_("(none       ) ")); break;     \
-                case DEBUG_INFO  : msg(_("(information) ")); break;     \
-                case DEBUG_TRACE : msg(_("(trace      ) ")); break;     \
-                case DEBUG_FUNC  : msg(_("(function   ) ")); break;     \
-                case DEBUG_ALL   : msg(_("(all        ) ")); break;     \
-                default          : msg(_("(undefine   ) ")); break;     \
-                }                                                       \
-            }                                                           \
-          if (debug >= DEBUG_FUNC)                                      \
-            {                                                           \
-              msg(  "<%s> " ,func);                                     \
-              msg(_("In file %s, "),__FILE__);                          \
-              msg(_("at line %d " ),__LINE__);                          \
-              msg(  ": " );                                             \
-            }                                                           \
-          msg(str);                                                     \
-          msg("\n");                                                    \
-        }                                                               \
+            if (debug >= DEBUG_ALL )                                    \
+              {                                                         \
+                switch (DEBUG_ ## level)                                \
+                  {                                                     \
+                  case DEBUG_NONE  : msg(_("(none       ) ")); break;   \
+                  case DEBUG_INFO  : msg(_("(information) ")); break;   \
+                  case DEBUG_TRACE : msg(_("(trace      ) ")); break;   \
+                  case DEBUG_FUNC  : msg(_("(function   ) ")); break;   \
+                  case DEBUG_ALL   : msg(_("(all        ) ")); break;   \
+                  default          : msg(_("(undefine   ) ")); break;   \
+                  }                                                     \
+              }                                                         \
+            if (debug >= DEBUG_FUNC)                                    \
+              {                                                         \
+                msg(  "<%s> " ,func);                                   \
+                msg(_("In file %s, "),__FILE__);                        \
+                msg(_("at line %d " ),__LINE__);                        \
+                msg(  ": " );                                           \
+              }                                                         \
+            msg(str);                                                   \
+            msg("\n");                                                  \
+          }                                                             \
     } while(0)
 

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

@@ -15 +15 @@
 #endif
 debug_verbosity_t debug;
+bool              debug_cycle_test;
+double            debug_cycle_start;
+double            debug_cycle_stop ;
 
 #undef  FUNCTION
@@ -24 +27 @@
     {
       debug = DEBUG;
-
-//       debug_initialized = true;
+      debug_cycle_test = false;
+//    debug_initialized = true;
     }
 #endif
@@ -32 +35 @@
 #undef  FUNCTION
 #define FUNCTION "debug_init"
-void debug_init (debug_verbosity_t level)
+void debug_init (debug_verbosity_t level,
+                 double            cycle_start,
+                 double            cycle_stop )
 {
 #ifdef DEBUG
@@ -39 +44 @@
       // Take min
       debug = (level < DEBUG)?level:DEBUG;
-      
+     
+#ifdef SYSTEMC
+      debug_cycle_test  = (cycle_stop > cycle_start) or (cycle_stop == -1);
+      debug_cycle_start = cycle_start;
+      debug_cycle_stop  = cycle_stop;
+#else
+      debug_cycle_test = false;
+#endif
+
       debug_initialized = true;
     }

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

@@ -8 +8 @@
 #include "Common/include/Debug.h"
 #include "Common/include/Environment.h"
-#include "Common/include/ToString.h"
 #include "Common/include/ErrorMorpheo.h"
+#include "Common/include/Filename.h"
 #include <sys/types.h>
-#include <unistd.h>
 
 namespace morpheo {
@@ -39 +38 @@
           {
             // if the file is not define, take pid.
-            std::string filename = directory+"/Morpheo_"+((file!="")?file:toString<pid_t>(getpid()))+".log";
+            std::string filename = morpheo::filename(directory,
+                                                     "Morpheo",
+                                                     "",
+                                                     "log",
+                                                     (file==""),
+                                                     (file==""),
+                                                     true);
             
             log_stream = fopen (filename.c_str(), "w");