From 3d306914ac98469e3d43b59de125efe64ddea8a5 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Wed, 27 Jun 2007 16:29:33 +0000 Subject: [PATCH] Fix non-debug build of FIRM. [r14796] --- ir/ana/irlivechk.c | 4 ++-- ir/be/beilpsched.c | 8 ++++---- ir/be/ia32/ia32_new_nodes.c | 2 +- ir/common/debug.h | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c index 3bdc8dfe4..34d428dea 100644 --- a/ir/ana/irlivechk.c +++ b/ir/ana/irlivechk.c @@ -266,7 +266,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg) /* now fill the two remaining bitsets concerning back edges */ compute_back_edge_sets(res, get_irg_start_block(irg)); - DEBUG_ONLY_NICE { + DEBUG_ONLY({ DBG((res->dbg, LEVEL_1, "liveness chk in %+F\n", irg)); for (i = res->n_blocks - 1; i >= 0; --i) { ir_node *irn = dfs_get_pre_num_node(res->dfs, i); @@ -276,7 +276,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg) DBG((res->dbg, LEVEL_1, "\ttgt reach: %B\n", bi->be_tgt_reach)); DBG((res->dbg, LEVEL_1, "\ttgt dom: %B\n", bi->be_tgt_dom)); } - } + }) DBG((res->dbg, LEVEL_1, "back edge src: %B\n", res->back_edge_src)); DBG((res->dbg, LEVEL_1, "back edge tgt: %B\n", res->back_edge_tgt)); diff --git a/ir/be/beilpsched.c b/ir/be/beilpsched.c index 7d9c6a585..a21da637d 100644 --- a/ir/be/beilpsched.c +++ b/ir/be/beilpsched.c @@ -1901,7 +1901,7 @@ static void create_ilp(ir_node *block, void *walk_env) { DBG((env->dbg, LEVEL_1, "ILP to solve: %u variables, %u constraints\n", lpp->var_next, lpp->cst_next)); /* debug stuff, dump lpp when debugging is on */ - DEBUG_ONLY_NICE { + DEBUG_ONLY({ if (firm_dbg_get_mask(env->dbg) > 1) { char buf[1024]; FILE *f; @@ -1913,7 +1913,7 @@ static void create_ilp(ir_node *block, void *walk_env) { snprintf(buf, sizeof(buf), "lpp_block_%lu.mps", get_irn_node_nr(block)); lpp_dump(lpp, buf); } - } + }) /* set solve time limit */ lpp_set_time_limit(lpp, env->opts->time_limit); @@ -1944,7 +1944,7 @@ static void create_ilp(ir_node *block, void *walk_env) { char buf[1024]; FILE *f; - DEBUG_ONLY_NICE { + DEBUG_ONLY({ if (firm_dbg_get_mask(env->dbg) >= 2) { snprintf(buf, sizeof(buf), "lpp_block_%lu.infeasible.txt", get_irn_node_nr(block)); f = fopen(buf, "w"); @@ -1954,7 +1954,7 @@ static void create_ilp(ir_node *block, void *walk_env) { lpp_dump(lpp, buf); dump_ir_block_graph(env->irg, "-infeasible"); } - } + }) ir_fprintf(stderr, "ILP found no solution within time (%+F, %+F), falling back to heuristics.\n", block, env->irg); need_heur = 1; diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c index 1d5f8ab97..d4bef7979 100644 --- a/ir/be/ia32/ia32_new_nodes.c +++ b/ir/be/ia32/ia32_new_nodes.c @@ -1240,7 +1240,7 @@ init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst, { ia32_immediate_attr_t *attr = get_irn_generic_attr(res); -#ifndef DEBUG +#ifndef NDEBUG attr->attr.attr_type |= IA32_ATTR_ia32_immediate_attr_t; #endif attr->symconst = symconst; diff --git a/ir/common/debug.h b/ir/common/debug.h index 0b923fb7c..8265a377f 100644 --- a/ir/common/debug.h +++ b/ir/common/debug.h @@ -187,7 +187,6 @@ void firm_dbg_set_file(firm_dbg_module_t *module, FILE *file); #define FIRM_DBG_REGISTER(handle, name) handle = firm_dbg_register(name) #define DEBUG_ONLY(code) code #define RELEASE_ONLY(code) -#define DEBUG_ONLY_NICE #else /* ndef DEBUG_libfirm */ @@ -200,7 +199,6 @@ void firm_dbg_set_file(firm_dbg_module_t *module, FILE *file); #define FIRM_DBG_REGISTER(handle, name) #define DEBUG_ONLY(code) #define RELEASE_ONLY(code) code -#define DEBUG_ONLY_NICE if(0) #define firm_dbg_set_mask(module, mask) #define firm_dbg_get_mask(module) -- 2.20.1