Changeset 137 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Debug_signal.h

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Debug_signal.h (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Debug_signal.h

@@ -11 +11 @@
 # ifdef DEBUG_SIGNAL
 
-#include <set>
-#include "Common/include/Message.h"
+#include <map>
+#include <list>
+#include <string>
 
 namespace morpheo {
 namespace behavioural {
 
-  extern std::set<void *> _debug_signal;
+  class debug_signal
+  {
+  private : std::map <void *,std::string> _signal;
+  private : std::list<std::string>        _signal_access;
+
+  public  : void add       (void *      signal,
+                            std::string name);
+  public  : void write     (void *      signal);
+  public  : void end_cycle (void);
+  public  : void print     (void);
+  };
   
-#  define DEBUG_SIGNAL_ADD(signal)                                      \
+  extern debug_signal _debug_signal;
+  
+#  define DEBUG_SIGNAL_ADD(signal,name)                                 \
   do                                                                    \
     {                                                                   \
-      morpheo::behavioural::_debug_signal.insert(static_cast<void *>( signal)); \
+      morpheo::behavioural::_debug_signal.add(signal,name);             \
     } while(0)
+
+  // Test if signal is previously define  
   
-#  define DEBUG_SIGNAL_ACCESS(signal)                                   \
+#  define DEBUG_SIGNAL_WRITE(signal)                                    \
   do                                                                    \
     {                                                                   \
-      if (morpheo::behavioural::_debug_signal.find(static_cast<void *>(signal)) == morpheo::behavioural::_debug_signal.end()) \
-        msgError("At file %s, in line %d, invalid signal.\n",__FILE__,__LINE__); \
+      morpheo::behavioural::_debug_signal.write(signal);                \
     } while(0)
+
+#  define DEBUG_SIGNAL_END_CYCLE()                      \
+  do                                                    \
+    {                                                   \
+      morpheo::behavioural::_debug_signal.end_cycle();  \
+    } while (0)
+
+#  define DEBUG_SIGNAL_PRINT()                          \
+  do                                                    \
+    {                                                   \
+      morpheo::behavioural::_debug_signal.print();      \
+    } while (0)
   
 }; // end namespace behavioural          
 }; // end namespace morpheo              
 # else
-#  define DEBUG_SIGNAL_ADD(signal)    do {} while (0)
-#  define DEBUG_SIGNAL_ACCESS(signal) do {} while (0)
+#  define DEBUG_SIGNAL_ADD(signal,name) do {} while (0)
+#  define DEBUG_SIGNAL_WRITE(signal)    do {} while (0)
+#  define DEBUG_SIGNAL_END_CYCLE()      do {} while (0)
+#  define DEBUG_SIGNAL_PRINT()          do {} while (0)
 # endif