X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firargs.c;h=b2e292ef1cc2ba6118ffc655db9c3cff6b9d479e;hb=23ea16875f38dc0c067cce24f64b5c70f3acc496;hp=daa86443d8d5909aa7d4f649255fe1e895d7804e;hpb=ea4a377477237e918fb51c7a4c328ff5eb8aee5c;p=libfirm diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c index daa86443d..b2e292ef1 100644 --- a/ir/ir/irargs.c +++ b/ir/ir/irargs.c @@ -14,10 +14,12 @@ # include "config.h" #endif +#ifdef WITH_LIBCORE + #include "bitset.h" #include -#include +#include #include "firm_common.h" #include "irnode_t.h" @@ -29,21 +31,22 @@ /** * identify a firm object type */ -static int firm_get_arg_type(const arg_occ_t *occ) { +static int firm_get_arg_type(const lc_arg_occ_t *occ) { /* Firm objects are always pointer */ - return arg_type_ptr; + return lc_arg_type_ptr; } -static int firm_get_arg_type_int(const arg_occ_t *occ) { - return arg_type_int; +static int firm_get_arg_type_int(const lc_arg_occ_t *occ) { + return lc_arg_type_int; } -static int bitset_get_arg_type(const arg_occ_t *occ) { - return arg_type_ptr; +static int bitset_get_arg_type(const lc_arg_occ_t *occ) { + return lc_arg_type_ptr; } -static int bitset_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t *arg) +static int bitset_emit(lc_appendable_t *app, + const lc_arg_occ_t *occ, const lc_arg_value_t *arg) { int res = 2; bitset_t *b = arg->v_ptr; @@ -51,16 +54,16 @@ static int bitset_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_ char buf[32]; const char *prefix = ""; - arg_append(app, occ, "[", 1); - for(p = bitset_next_set(b, 0); p != -1; p = bitset_next_set(b, p)) { + lc_arg_append(app, occ, "[", 1); + bitset_foreach(b, p) { int n; n = snprintf(buf, sizeof(buf), "%s%d", prefix, (int) p); - arg_append(app, occ, buf, n); + lc_arg_append(app, occ, buf, n); prefix = ", "; res += n; } - arg_append(app, occ, "]", 1); + lc_arg_append(app, occ, "]", 1); return res; } @@ -68,7 +71,8 @@ static int bitset_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_ /** * emit an opaque Firm dbg_info object */ -static int firm_emit_dbg(appendable_t *app, const arg_occ_t *occ, const arg_value_t *arg) +static int firm_emit_dbg(lc_appendable_t *app, + const lc_arg_occ_t *occ, const lc_arg_value_t *arg) { char buf[1024]; ir_node *irn = arg->v_ptr; @@ -79,13 +83,23 @@ static int firm_emit_dbg(appendable_t *app, const arg_occ_t *occ, const arg_valu if (__dbg_info_snprint(buf, sizeof(buf), dbg) <= 0) buf[0] = '\0'; } - return arg_append(app, occ, buf, strlen(buf)); + return lc_arg_append(app, occ, buf, strlen(buf)); +} + +/** + * Beware: do not set the entity ld_name + */ +static const char *get_entity_ld_name_ex(entity *ent) { + if (ent->ld_name) + return get_entity_ld_name(ent); + return get_entity_name(ent); } /** * emit a Firm object */ -static int firm_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t *arg) +static int firm_emit(lc_appendable_t *app, + const lc_arg_occ_t *occ, const lc_arg_value_t *arg) { #define A(s) occ->flag_hash ? s " ": "" @@ -95,7 +109,8 @@ static int firm_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t ir_node *block; char add[64]; char buf[256]; - char tv[256]; + char tv_buf[256]; + entity *ent; buf[0] = '\0'; add[0] = '\0'; @@ -110,7 +125,7 @@ static int firm_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t break; case k_entity: snprintf(buf, sizeof(buf), "%s%s", A("ent"), - isupper(occ->conversion) ? get_entity_ld_name(X): get_entity_name(X)); + isupper(occ->conversion) ? get_entity_ld_name_ex(X): get_entity_name(X)); snprintf(add, sizeof(add), "[%ld]", get_entity_nr(X)); break; case k_type: @@ -118,7 +133,10 @@ static int firm_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t snprintf(add, sizeof(add), "[%ld]", get_type_nr(X)); break; case k_ir_graph: - snprintf(buf, sizeof(buf), "%s%s", A("irg"), get_entity_name(get_irg_entity(X))); + if (X == get_const_code_irg()) + snprintf(buf, sizeof(buf), "%s", A("irg")); + else + snprintf(buf, sizeof(buf), "%s%s", A("irg"), get_entity_name(get_irg_entity(X))); snprintf(add, sizeof(add), "[%ld]", get_irg_graph_nr(X)); break; case k_ir_node: @@ -134,50 +152,64 @@ static int firm_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t break; default: if (is_Const(X)) { - tarval_snprintf(tv, sizeof(tv), get_Const_tarval(X)); + tarval *tv = get_Const_tarval(X); + if (tv) + 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), - get_mode_name(get_irn_mode(X)), tv); + get_mode_name(get_irn_mode(X)), tv_buf); } else 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]", get_irn_node_nr(X)); + snprintf(add, sizeof(add), "[%ld:%d]", get_irn_node_nr(X), get_irn_idx(X)); } break; case k_ir_mode: snprintf(buf, sizeof(buf), "%s%s", A("mode"), get_mode_name(X)); break; case k_tarval: - tarval_snprintf(tv, sizeof(tv), X); - snprintf(buf, sizeof(buf), "%s%s", A("tv"), tv); + tarval_snprintf(tv_buf, sizeof(tv_buf), X); + snprintf(buf, sizeof(buf), "%s%s", A("tv"), tv_buf); break; case k_ir_loop: - snprintf(buf, sizeof(buf), "ldepth[%d]", get_loop_depth(X)); + snprintf(buf, sizeof(buf), "loop[%d:%d]", get_loop_loop_nr(X), get_loop_depth(X)); break; case k_ir_op: snprintf(buf, sizeof(buf), "%s%s", A("op"), get_op_name(X)); break; case k_ir_compound_graph_path: - strncat(buf, A("cgp"), sizeof(buf)); - n = get_compound_graph_path_length(X); + for (i = 0; i < n; ++i) { - entity *ent = get_compound_graph_path_node(X, i); + ent = get_compound_graph_path_node(X, i); + + strncat(buf, ".", sizeof(buf)); strncat(buf, get_entity_name(ent), sizeof(buf)); - if (i < n - 1) - strncat(buf, ".", sizeof(buf)); + if (is_Array_type(get_entity_owner(ent))) { + snprintf(add, sizeof(add), "[%d]", + get_compound_graph_path_array_index(X, i)); + strncat(buf, add, sizeof(buf)); + } } + add[0] = '\0'; break; + case k_ir_extblk: + snprintf(buf, sizeof(buf), "ExtBlock"); + snprintf(add, sizeof(add), "[%ld]", get_irn_node_nr(get_extbb_leader(X))); + break; + default: snprintf(buf, sizeof(buf), "UNKWN"); snprintf(add, sizeof(add), "[%p]", X); } } - if(occ->flag_plus) + if (occ->flag_plus) strncat(buf, add, sizeof(buf)); - return arg_append(app, occ, buf, strlen(buf)); + return lc_arg_append(app, occ, buf, strlen(buf)); #undef A } @@ -185,24 +217,26 @@ static int firm_emit(appendable_t *app, const arg_occ_t *occ, const arg_value_t /** * emit an ident */ -static int firm_emit_ident(appendable_t *app, const arg_occ_t *occ, const arg_value_t *arg) +static int firm_emit_ident(lc_appendable_t *app, + const lc_arg_occ_t *occ, const lc_arg_value_t *arg) { ident *id = (ident *)arg->v_ptr; const char *p = id ? get_id_str(id) : "(null)"; - return arg_append(app, occ, p, strlen(p)); + return lc_arg_append(app, occ, p, strlen(p)); } /** * Emit indent. */ -static int firm_emit_indent(appendable_t *app, const arg_occ_t *occ, const arg_value_t *arg) +static int firm_emit_indent(lc_appendable_t *app, + const lc_arg_occ_t *occ, const lc_arg_value_t *arg) { int i; - int amount = arg->v_int; + int amount = arg->v_int * (occ->width > 0 ? occ->width : 1); for(i = 0; i < amount; ++i) - appendable_chadd(app, ' '); + lc_appendable_chadd(app, ' '); return amount; } @@ -210,26 +244,27 @@ static int firm_emit_indent(appendable_t *app, const arg_occ_t *occ, const arg_v /** * Emit pnc. */ -static int firm_emit_pnc(appendable_t *app, const arg_occ_t *occ, const arg_value_t *arg) +static int firm_emit_pnc(lc_appendable_t *app, + const lc_arg_occ_t *occ, const lc_arg_value_t *arg) { int value = arg->v_int; const char *p = get_pnc_string(value); - return arg_append(app, occ, p, strlen(p)); + return lc_arg_append(app, occ, p, strlen(p)); } -arg_env_t *firm_get_arg_env(void) +lc_arg_env_t *firm_get_arg_env(void) { #define X(name, letter) {"firm:" name, letter} - static arg_env_t *env = NULL; + static lc_arg_env_t *env = NULL; - static arg_handler_t firm_handler = { firm_get_arg_type, firm_emit }; - static arg_handler_t ident_handler = { firm_get_arg_type, firm_emit_ident }; - static arg_handler_t indent_handler = { firm_get_arg_type_int, firm_emit_indent }; - static arg_handler_t pnc_handler = { firm_get_arg_type_int, firm_emit_pnc }; - static arg_handler_t bitset_handler = { bitset_get_arg_type, bitset_emit }; - static arg_handler_t debug_handler = { firm_get_arg_type, firm_emit_dbg }; + static lc_arg_handler_t firm_handler = { firm_get_arg_type, firm_emit }; + static lc_arg_handler_t ident_handler = { firm_get_arg_type, firm_emit_ident }; + static lc_arg_handler_t indent_handler = { firm_get_arg_type_int, firm_emit_indent }; + static lc_arg_handler_t pnc_handler = { firm_get_arg_type_int, firm_emit_pnc }; + static lc_arg_handler_t bitset_handler = { bitset_get_arg_type, bitset_emit }; + static lc_arg_handler_t debug_handler = { firm_get_arg_type, firm_emit_dbg }; static struct { const char *name; @@ -244,25 +279,27 @@ arg_env_t *firm_get_arg_env(void) X("irn_nr", 'N'), X("mode", 'm'), X("block", 'B'), - X("pnc", '='), + X("cg_path", 'P'), }; int i; if(env == NULL) { - env = arg_new_env(); - arg_add_std(env); + env = lc_arg_new_env(); + lc_arg_add_std(env); - arg_register(env, "firm", 'F', &firm_handler); + lc_arg_register(env, "firm", 'F', &firm_handler); for (i = 0; i < sizeof(args)/sizeof(args[0]); ++i) - arg_register(env, args[i].name, args[i].letter, &firm_handler); + lc_arg_register(env, args[i].name, args[i].letter, &firm_handler); - arg_register(env, "firm:ident", 'I', &ident_handler); - arg_register(env, "firm:indent", 'D', &indent_handler); - arg_register(env, "firm:pnc", '=', &pnc_handler); - arg_register(env, "firm:dbg_info", 'g', &debug_handler); - /* arg_register(env, "firm:bitset", 'b', &bitset_handler); */ + lc_arg_register(env, "firm:ident", 'I', &ident_handler); + lc_arg_register(env, "firm:indent", '>', &indent_handler); + lc_arg_register(env, "firm:dbg_info", 'G', &debug_handler); + lc_arg_register(env, "firm:bitset", 'B', &bitset_handler); + lc_arg_register(env, "firm:pnc", '=', &pnc_handler); } return env; } + +#endif /* WITH_LIBCORE */