Changeset 27 for sources/src/sc_trace.cc

Timestamp:

May 4, 2009, 8:51:56 PM (15 years ago)

Author:

buchmann

Message:

SystemCASS now uses autoconf/automake to build the API. Regression tests still
use the old Makefiles.
(thanks to Nicolas Pouillon)

The library directory no longer is "lib-arch-system". The directory now is "lib-linux". Everyone needs to pay attention about SYSTEMCASS environment variable.

Changes:

• system header includes
• Add includes to config.h (generated by autoconf/automake)
• test:
  • linux preprocessor macro instead of _WIN32
  • CONFIG_DEBUG instead of DEBUG

Removes:

• Makefile
• guess_endianness.cc
• guess_os.sh
• assert.h (we now use standard assert.h)
• Options.def

File:

• sources/src/sc_trace.cc (modified) (11 diffs)

sources/src/sc_trace.cc

@@ -41 +41 @@
 #include "bit2string.h"
 #include "hex2string.h"
-#include "assert.h"
-
+
+#include <cassert>
 #include <list>
 #include <cstdio>
@@ -48 +48 @@
 #include <cstring> //strlen
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 //-----------------------------------------
 
@@ -53 +57 @@
 
 //-----------------------------------------
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 
 extern "C" {
@@ -63 +67 @@
 #include <cstdio>
 
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 //-----------------------------------------
 
@@ -165 +169 @@
     {
       sc_trace_file *tf = *ptf;
-      ASSERT(tf != NULL);
+      assert(tf != NULL);
                 trace (*tf, part);
     }
@@ -173 +177 @@
 }
 
-#if PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 static void
 pat_set_value (char *buf, const signal2trace &s)
@@ -283 +287 @@
 {
 }
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 
 static
@@ -414 +418 @@
   else
     vcd_signal_table = (tab_t*) malloc (sizeof (tab_t) * size);
-#if DEBUG
+#ifdef CONFIG_DEBUG
   if (vcd_signal_table == NULL)
   {
@@ -486 +490 @@
       vcd_trace_init (tf);
   } else {
-#if defined(DEBUG)
+#if defined(CONFIG_DEBUG)
       if (vcd_signal_table == NULL)
       {
@@ -580 +584 @@
 &name)
 {
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
         //exemple:
         //DECLAR ("a", ":2", "X", IN, "3  downto 0", "" );
@@ -630 +634 @@
 #endif
         DECLAR ((char*)(name.c_str ()), ":1", format, dir,(char *) downto.c_str(), "" );
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 }