From 279276d88fb9248284c8961d5c647b632fe2a26e Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Tue, 4 Dec 2007 09:06:18 +0000 Subject: [PATCH] always use firm builtin debug facilities (libcore ones are more or less a copy of it anyway) [r16878] --- ir/common/debug.c | 26 ++------------------------ ir/common/debug.h | 38 +------------------------------------- 2 files changed, 3 insertions(+), 61 deletions(-) diff --git a/ir/common/debug.c b/ir/common/debug.c index 710b79671..918ade01a 100644 --- a/ir/common/debug.c +++ b/ir/common/debug.c @@ -42,28 +42,6 @@ #include "obst.h" #include "set.h" -#ifdef WITH_LIBCORE - -#include "irargs_t.h" - -static void firm_dbg_default_printer(struct obstack *obst, const char *fmt, va_list args) -{ - static lc_arg_env_t *env = NULL; - - if(!env) - env = firm_get_arg_env(); - - lc_evoprintf(env, obst, fmt, args); - -} - -firm_dbg_module_t *firm_dbg_register(const char *name) -{ - return lc_dbg_register_with_printer(name, firm_dbg_default_printer); -} - -#else - static struct obstack dbg_obst; static set *module_set; @@ -83,6 +61,8 @@ static int module_cmp(const void *p1, const void *p2, size_t size) { const firm_dbg_module_t *m1 = p1; const firm_dbg_module_t *m2 = p2; + (void) size; + return strcmp(m1->name, m2->name); } @@ -187,8 +167,6 @@ void _firm_dbg_print(const firm_dbg_module_t *mod, unsigned mask, const char *fm } } -#endif /* WITH_LIBCORE */ - #else /* DEBUG_libfirm */ /* some picky compiler don't allow empty files */ diff --git a/ir/common/debug.h b/ir/common/debug.h index 8265a377f..5b79b90ca 100644 --- a/ir/common/debug.h +++ b/ir/common/debug.h @@ -29,42 +29,8 @@ #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 - -/* 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 @@ -181,8 +147,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 -- 2.20.1