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

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/src/Debug.cpp (modified) (4 diffs)
• IPs/systemC/processor/Morpheo/Common/src/Message.cpp (modified) (2 diffs)

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");