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

Timestamp:

May 12, 2010, 7:34:01 PM (14 years ago)

Author:

rosiere

Message:

1) add counters_t type for interface
2) fix in check load in load_store_unit
3) add parameters (but not yet implemented)
4) change environment and add script (distcc_env.sh ...)
5) add warning if an unser change rename flag with l.mtspr instruction
6) ...

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• include/Debug.h (modified) (5 diffs)
• include/Debug_type.h (modified) (2 diffs)
• include/ErrorMorpheo.h (modified) (1 diff)
• include/Time.h (modified) (1 diff)
• src/Debug.cpp (modified) (1 diff)

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

@@ -27 +27 @@
 #include "Common/include/Systemc.h"
 #include "Common/include/Message.h"
-#include "Common/include/FromString.h"
 #include "Common/include/ChangeCase.h"
 #include "Behavioural/include/Debug_component.h"
@@ -68 +67 @@
 #define debug_test_simulation_time                                      \
   (not debug_cycle_test or                                              \
-   ( (simulation_cycle() >= debug_cycle_start) and                    \
-    ((simulation_cycle() <= debug_cycle_stop) or                      \
-      (debug_cycle_stop == -1))))
+  ((simulation_cycle() >= debug_cycle_start) and                        \
+   ((simulation_cycle() <= debug_cycle_stop) or                         \
+    (debug_cycle_stop == -1))))
 #else
 #define debug_test_simulation_time true
@@ -82 +81 @@
                                                                         \
       if (debug_test_simulation_time and                                \
-          ((debug == DEBUG_ALL ) or                                     \
-           (( DEBUG_ ## level <= debug) and                             \
-            ( morpheo::behavioural::_model.get_debug(NAME_ ## component))))) \
+          (( DEBUG_ ## level <= debug) and                              \
+           ( morpheo::behavioural::_model.get_debug(NAME_ ## component)))) \
         {                                                               \
           if (DEBUG_ ## level <= DEBUG_INFO)                            \
@@ -156 +154 @@
   do                                                                    \
     {                                                                   \
-      fprintf(stdout,_("%s "),MSG_BREAKPOINT);                                     \
-      fprintf(stdout,_("Breakpoint in file %s, line %d.\n"),__FILE__,__LINE__);    \
-      fprintf(stdout,_("%s "),MSG_NONE);                                           \
-      fprintf(stdout,str);                                                              \
-      fprintf(stdout,_("\n"));                                                     \
-      fprintf(stdout,_("%s "),MSG_NONE);                                           \
-      fprintf(stdout,_("Enter any key to continue\n"));                            \
+      fmsg(_("%s "),MSG_BREAKPOINT);                                    \
+      fmsg(_("Breakpoint in file %s, line %d.\n"),__FILE__,__LINE__);   \
+      fmsg(_("%s "),MSG_NONE);                                          \
+      fmsg(str);                                                        \
+      fmsg(_("\n"));                                                    \
+      fmsg(_("%s "),MSG_NONE);                                          \
+      fmsg(_("Enter any key to continue\n"));                           \
       getchar();                                                        \
     } while(0)
@@ -182 +180 @@
 #endif
 
-
-  template<> inline debug_verbosity_t fromString<debug_verbosity_t> (const std::string& x)
-  {
-    std::string y=x;
-    LowerCase(y);
-
-    if ( (y.compare("0")     == 0) or
-         (y.compare("none")  == 0))
-      return DEBUG_NONE ;
-    if ( (y.compare("1")     == 0) or
-         (y.compare("info")  == 0))
-      return DEBUG_INFO ;
-    if ( (y.compare("2")     == 0) or
-         (y.compare("trace") == 0))
-      return DEBUG_TRACE;
-    if ( (y.compare("3")     == 0) or
-         (y.compare("func")  == 0))
-      return DEBUG_FUNC ;
-    if ( (y.compare("4")     == 0) or
-         (y.compare("all")   == 0))
-      return DEBUG_ALL  ;
-
-#ifdef DEBUG
-    return DEBUG;
-#else
-    return DEBUG_NONE ;
-#endif
-  }
-
 }; // end namespace morpheo
 #endif // !DEBUG_H

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

@@ -15 +15 @@
  */
 
+#include "Common/include/ToString.h"
+#include "Common/include/FromString.h"
+
 
 namespace morpheo {
@@ -27 +30 @@
   } debug_verbosity_t;
 
+  template<> inline std::string toString<debug_verbosity_t>(const debug_verbosity_t& x)
+  {
+    switch (x)
+      {
+      case DEBUG_NONE  : return "debug_none" ; break;
+      case DEBUG_INFO  : return "debug_info" ; break;
+      case DEBUG_TRACE : return "debug_trace"; break;
+      case DEBUG_FUNC  : return "debug_func" ; break;
+      case DEBUG_ALL   : return "debug_all"  ; break;
+      default    : return ""      ; break;
+      }
+  };
+
+  template<> inline debug_verbosity_t fromString<debug_verbosity_t>(const std::string& x)
+  {
+    if ((x.compare(toString(static_cast<uint32_t>(DEBUG_NONE ))) == 0) or
+        (x.compare(toString(                      DEBUG_NONE  )) == 0))
+      return DEBUG_NONE;
+
+    if ((x.compare(toString(static_cast<uint32_t>(DEBUG_INFO ))) == 0) or
+        (x.compare(toString(                      DEBUG_INFO  )) == 0))
+      return DEBUG_INFO;
+
+    if ((x.compare(toString(static_cast<uint32_t>(DEBUG_TRACE))) == 0) or
+        (x.compare(toString(                      DEBUG_TRACE )) == 0))
+      return DEBUG_TRACE;
+
+    if ((x.compare(toString(static_cast<uint32_t>(DEBUG_FUNC ))) == 0) or
+        (x.compare(toString(                      DEBUG_FUNC  )) == 0))
+      return DEBUG_FUNC;
+
+    if ((x.compare(toString(static_cast<uint32_t>(DEBUG_ALL  ))) == 0) or
+        (x.compare(toString(                      DEBUG_ALL   )) == 0))
+      return DEBUG_ALL;
+
+#ifdef DEBUG
+    return DEBUG;
+#else
+    return DEBUG_NONE ;
+#endif
+  };
+
 }; // end namespace morpheo
 #endif

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

@@ -39 +39 @@
       _msg = toString(_("%s %s"),MSG_ERROR,msg.c_str());
 #endif
-      msg("%s",_msg.c_str());
+//     msg("%s",_msg.c_str());
     }
   public  :             ~ErrorMorpheo (void)       throw() {}

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

@@ -10 +10 @@
 #include <sys/time.h>
 #include "Common/include/Systemc.h"
+#include "Common/include/Message.h"
 
 namespace morpheo {

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

@@ -45 +45 @@
 #ifdef DEBUG
       // Take min
-      debug = (level < DEBUG)?level:DEBUG;
+      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;
+      debug_cycle_test  = (not (cycle_start == -1) and
+                           ((cycle_stop > cycle_start) or 
+                            (cycle_stop == -1)));
+      debug_cycle_start = cycle_start;
+      debug_cycle_stop  = cycle_stop;
 # else
-      debug_cycle_test = false;
+      debug_cycle_test  = false;
 # endif
+# else
+      debug             = DEBUG_NONE;
+      debug_cycle_test  = false;
+      debug_cycle_start = 0;
+      debug_cycle_stop  = 0;
 #endif
-      debug_idle_cycle = idle_cycle;
-      debug_idle_time  = idle_time ;
+
+      debug_idle_cycle  = idle_cycle;
+      debug_idle_time   = idle_time ;
+
+      msgInformation(_("Debug level : %s\n"),toString(debug).c_str());
+      // msgDebug(_("Cycle test  : %d\n"),debug_cycle_test);
+      // msgDebug(_("Cycle start : %f\n"),cycle_start);
+      // msgDebug(_("Cycle stop  : %f\n"),cycle_stop);
 
       debug_initialized = true;