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

Timestamp:

Jul 17, 2007, 4:47:56 PM (17 years ago)

Author:

rosiere

Message:

Modification des classes d'encapsulation des interfaces.
Stable sur tous les composants actuels

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• include (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Common/Include)
• include/Debug.h (modified) (1 diff)
• include/Test.h (modified) (2 diffs)
• src (added)

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

@@ -48 +48 @@
             }                                                           \
           }                                                             \
-        fprintf(stdout,"In file %s, ",__FILE__);                        \
-        fprintf(stdout,"at line %d, ",__LINE__);                        \
+        fprintf(stdout,"<%s> ",func);                                   \
         if (DEBUG >= DEBUG_FUNC)                                        \
-          {                                                             \
-            fprintf(stdout,"in function \"%s\" ",func);                 \
-          }                                                             \
+        {                                                               \
+          fprintf(stdout,"In file %s, ",__FILE__);                      \
+          fprintf(stdout,"at line %d, ",__LINE__);                      \
+        }                                                               \
         fprintf(stdout,": ");                                           \
         fprintf(stdout,str);                                            \

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

@@ -5 +5 @@
 #include <sstream>
 #include <stdint.h>
-#include "Include/ErrorMorpheo.h"
+#include "Common/include/ErrorMorpheo.h"
 using namespace std;
 
@@ -42 +42 @@
 };
 
-#define TEST(type,exp1,exp2) do { test<type> (exp1,exp2,__FILE__,__LINE__);} while(0)
+#define TEST(type,exp1,exp2)            do {                      test<type> (exp1,exp2,__FILE__,__LINE__);} while(0)
+#define TEST_STR(type,exp1,exp2,str...) do { fprintf(stdout,str); test<type> (exp1,exp2,__FILE__,__LINE__);} while(0)
 
 #endif