From dbae9f349e934f5c976a77186c0c3b7948a963a9 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Tue, 1 Dec 2009 15:30:16 +0000 Subject: [PATCH] change debug printing of firm nodes: add a space between opcode and mode - so beginners catch that it is 2 things [r26762] --- ir/common/firm.c | 3 ++- ir/common/firm_common.c | 2 +- ir/common/irtools.c | 16 ++++++++++------ ir/ir/irargs.c | 12 ++++++------ ir/ir/irdump.c | 1 + ir/ir/irprintf.c | 5 ----- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ir/common/firm.c b/ir/common/firm.c index 6fb9d8491..852297071 100644 --- a/ir/common/firm.c +++ b/ir/common/firm.c @@ -61,7 +61,8 @@ #include "be_t.h" /* returns the firm root */ -lc_opt_entry_t *firm_opt_get_root(void) { +lc_opt_entry_t *firm_opt_get_root(void) +{ static lc_opt_entry_t *grp = NULL; if (!grp) grp = lc_opt_get_grp(lc_opt_root_grp(), "firm"); diff --git a/ir/common/firm_common.c b/ir/common/firm_common.c index 700ce1b08..4e233edd0 100644 --- a/ir/common/firm_common.c +++ b/ir/common/firm_common.c @@ -84,7 +84,7 @@ void firm_identify_thing(void *X) { printf("graph: %s: %ld (%p)\n", get_entity_name(get_irg_entity(X)), get_irg_graph_nr(X), X); break; case k_ir_node: - printf("irnode: %s%s %ld (%p)\n", get_irn_opname(X), get_mode_name(get_irn_mode(X)), get_irn_node_nr(X), X); + printf("irnode: %s %s %ld (%p)\n", get_irn_opname(X), get_mode_name(get_irn_mode(X)), get_irn_node_nr(X), X); break; case k_ir_mode: printf("mode %s: (%p)\n", get_mode_name(X), X); diff --git a/ir/common/irtools.c b/ir/common/irtools.c index d5f52237a..9fa902b56 100644 --- a/ir/common/irtools.c +++ b/ir/common/irtools.c @@ -35,13 +35,15 @@ #include "irpass_t.h" /* the famous clear_link implementation. */ -void firm_clear_link(ir_node *n, void *env) { +void firm_clear_link(ir_node *n, void *env) +{ (void) env; set_irn_link(n, NULL); } /* the famous clear_node_and_phi_links() implementation. */ -void firm_clear_node_and_phi_links(ir_node *n, void *env) { +void firm_clear_node_and_phi_links(ir_node *n, void *env) +{ (void) env; set_irn_link(n, NULL); if (is_Block(n)) @@ -58,8 +60,8 @@ void firm_clear_node_and_phi_links(ir_node *n, void *env) { * in an irg. Instead, the corresponding nodes of the new irg are returned. * Note further, that the new nodes have no block. */ -void -copy_irn_to_irg(ir_node *n, ir_graph *irg) { +void copy_irn_to_irg(ir_node *n, ir_graph *irg) +{ ir_op *op = get_irn_op(n); ir_graph *old_irg; ir_node *nn = NULL; @@ -128,7 +130,8 @@ copy_irn_to_irg(ir_node *n, ir_graph *irg) { * Creates an exact copy of a node. * The copy resides in the same graph in the same block. */ -ir_node *exact_copy(const ir_node *n) { +ir_node *exact_copy(const ir_node *n) +{ ir_graph *irg = get_irn_irg(n); ir_node *res, *block = NULL; @@ -159,7 +162,8 @@ ir_node *exact_copy(const ir_node *n) { /* * Dump a pset containing Firm objects. */ -void firm_pset_dump(pset *set) { +void firm_pset_dump(pset *set) +{ void *obj; foreach_pset(set, obj) { diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c index 9e6740f38..22ea1be36 100644 --- a/ir/ir/irargs.c +++ b/ir/ir/irargs.c @@ -155,8 +155,8 @@ static int firm_emit(lc_appendable_t *app, switch (occ->conversion) { case 'B': block = is_no_Block(X) ? get_nodes_block(X) : X; - snprintf(buf, sizeof(buf), "%s%s%s", A("irn"), get_irn_opname(block), - get_mode_name(get_irn_mode(block))); + snprintf(buf, sizeof(buf), "%s%s %s", A("irn"), + get_irn_opname(block), get_mode_name(get_irn_mode(block))); snprintf(add, sizeof(add), "[%ld]", get_irn_node_nr(block)); break; case 'N': @@ -169,16 +169,16 @@ static int firm_emit(lc_appendable_t *app, tarval_snprintf(tv_buf, sizeof(tv_buf), tv); else strncpy(tv_buf, "(NULL)", sizeof(tv_buf)); - snprintf(buf, sizeof(buf), "%s%s%s<%s>", A("irn"), get_irn_opname(X), + snprintf(buf, sizeof(buf), "%s%s %s<%s>", A("irn"), get_irn_opname(X), get_mode_name(get_irn_mode(X)), tv_buf); } else if (is_SymConst_addr_ent(X)) { - snprintf(buf, sizeof(buf), "%s%s%s[%s]", A("irn"), get_irn_opname(X), + snprintf(buf, sizeof(buf), "%s%s %s[%s]", A("irn"), get_irn_opname(X), get_mode_name(get_irn_mode(X)), get_entity_name(get_SymConst_entity(X))); } else if (is_Sel(X)) { - snprintf(buf, sizeof(buf), "%s%s%s[%s]", A("irn"), get_irn_opname(X), + snprintf(buf, sizeof(buf), "%s%s %s[%s]", A("irn"), get_irn_opname(X), get_mode_name(get_irn_mode(X)), get_entity_name(get_Sel_entity(X))); } else { - snprintf(buf, sizeof(buf), "%s%s%s", A("irn"), get_irn_opname(X), + snprintf(buf, sizeof(buf), "%s%s %s", A("irn"), get_irn_opname(X), get_mode_name(get_irn_mode(X))); } snprintf(add, sizeof(add), "[%ld:%d]", get_irn_node_nr(X), get_irn_idx(X)); diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c index 862b58b32..cd64da286 100644 --- a/ir/ir/irdump.c +++ b/ir/ir/irdump.c @@ -1200,6 +1200,7 @@ int dump_node_label(FILE *F, ir_node *n) { int bad = 0; bad |= dump_node_opcode(F, n); + fputs(" ", F); bad |= dump_node_mode(F, n); fprintf(F, " "); bad |= dump_node_typeinfo(F, n); diff --git a/ir/ir/irprintf.c b/ir/ir/irprintf.c index 5b288f53b..8faf32a5a 100644 --- a/ir/ir/irprintf.c +++ b/ir/ir/irprintf.c @@ -27,9 +27,6 @@ #include "config.h" #include -#ifdef HAVE_INTTYPES_H -#include -#endif #include #include @@ -50,8 +47,6 @@ #include "bitset.h" #include "dbginfo_t.h" -#define STRNIL "(nil)" - /** * Init the string. */ -- 2.20.1