X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Fdebug.h;h=1668ad04f7c46eed440e9355d4aa9be5403b5af5;hb=cbe8608ae6f9a523d007919691104b444c92d004;hp=8265a377f31e1b4005524c279eef74e46a79c7aa;hpb=d8fb82e90dd2f5eeabef30d91e5cde423820c006;p=libfirm

diff --git a/ir/common/debug.h b/ir/common/debug.h
index 8265a377f..1668ad04f 100644
--- a/ir/common/debug.h
+++ b/ir/common/debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,62 +27,26 @@
 #ifndef FIRM_COMMON_DEBUG_H
 #define FIRM_COMMON_DEBUG_H
 
-#include "firm_config.h"
-
-#ifdef DEBUG_libfirm
-
 /* WITH DEBUG OUTPUT */
-
-#ifdef WITH_LIBCORE
-
-#define DBG(x) _LC_DBG(x)
-#define DB(x)  _LC_DB(x)
-
-#include <libcore/lc_debug.h>
-
-/* use the newer debug implementation in libcore */
-typedef lc_dbg_module_t firm_dbg_module_t;
-
-extern firm_dbg_module_t *firm_dbg_register(const char *name);
-
-#define firm_dbg_set_mask(module, mask) lc_dbg_set_mask(module, mask)
-#define firm_dbg_get_mask(module)       lc_dbg_get_mask(module)
-#define firm_dbg_set_file(module, file) lc_dbg_set_file(module, file)
-
-#define LEVEL_DEFAULT    LC_LEVEL_DEFAULT
-#define LEVEL_1          LC_LEVEL_1
-#define LEVEL_2          LC_LEVEL_2
-#define LEVEL_3          LC_LEVEL_3
-#define LEVEL_4          LC_LEVEL_4
-#define LEVEL_5          LC_LEVEL_5
-#define SET_LEVEL_0      LC_SET_LEVEL_0
-#define SET_LEVEL_1      LC_SET_LEVEL_1
-#define SET_LEVEL_2      LC_SET_LEVEL_2
-#define SET_LEVEL_3      LC_SET_LEVEL_3
-#define SET_LEVEL_4      LC_SET_LEVEL_4
-#define SET_LEVEL_5      LC_SET_LEVEL_5
-#define SET_LEVEL_ALL    LC_SET_LEVEL_ALL
-
-#else /* WITH_LIBCORE */
-/* use the builtin debug implementation */
+#ifdef DEBUG_libfirm
 
 #include <stdio.h>
 
 enum firm_dbg_level_t {
-  LEVEL_DEFAULT = 0, /**< Prints always. Use with DBG(). */
-  LEVEL_1 = 1,
-  LEVEL_2 = 2,
-  LEVEL_3 = 4,
-  LEVEL_4 = 8,
-  LEVEL_5 = 16,
-
-  SET_LEVEL_0 = 0,   /**< use with firm_dbg_set_mask(). */
-  SET_LEVEL_1 = 1,
-  SET_LEVEL_2 = 3,
-  SET_LEVEL_3 = 7,
-  SET_LEVEL_4 = 15,
-  SET_LEVEL_5 = 31,
-  SET_LEVEL_ALL = SET_LEVEL_5
+	LEVEL_DEFAULT = 0, /**< Prints always. Use with DBG(). */
+	LEVEL_1 = 1,
+	LEVEL_2 = 2,
+	LEVEL_3 = 4,
+	LEVEL_4 = 8,
+	LEVEL_5 = 16,
+
+	SET_LEVEL_0 = 0,   /**< use with firm_dbg_set_mask(). */
+	SET_LEVEL_1 = 1,
+	SET_LEVEL_2 = 3,
+	SET_LEVEL_3 = 7,
+	SET_LEVEL_4 = 15,
+	SET_LEVEL_5 = 31,
+	SET_LEVEL_ALL = SET_LEVEL_5
 };
 
 typedef struct _firm_dbg_module_t firm_dbg_module_t;
@@ -181,8 +145,6 @@ void firm_dbg_set_file(firm_dbg_module_t *module, FILE *file);
 #define DBG(args)           _DBG(args)
 #define DB(args)            _DB(args)
 
-#endif /* WITH_LIBCORE */
-
 /** create a debug handle in debug mode */
 #define FIRM_DBG_REGISTER(handle, name) handle = firm_dbg_register(name)
 #define DEBUG_ONLY(code)   code
@@ -192,17 +154,17 @@ void firm_dbg_set_file(firm_dbg_module_t *module, FILE *file);
 
 /* DEBUG OUTPUT IS COMPLETELY DISABLED */
 
-#define DBG(x)
-#define DB(x)
+#define DBG(x)   (void)0
+#define DB(x)    (void)0
 
 /** create a debug handle in release mode */
-#define FIRM_DBG_REGISTER(handle, name)
+#define FIRM_DBG_REGISTER(handle, name)  (void)0
 #define DEBUG_ONLY(code)
 #define RELEASE_ONLY(code) code
 
-#define firm_dbg_set_mask(module, mask)
-#define firm_dbg_get_mask(module)
-#define firm_dbg_set_file(module, file)
+#define firm_dbg_set_mask(module, mask)  (void)0
+#define firm_dbg_get_mask(module)        (void)0
+#define firm_dbg_set_file(module, file)  (void)0
 
 #endif /* DEBUG_libfirm */