X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firargs.c;h=41678b724d9800bf779a8542603fc67c51bca667;hb=5af4cb6fd26054ef16c8da79d534abacb2a32c6e;hp=a9fc6f61c307fcaaec51dbe3d21269730f2403ee;hpb=63c755579d099e9fe6e05514adbe6a97506293e3;p=libfirm diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c index a9fc6f61c..41678b724 100644 --- a/ir/ir/irargs.c +++ b/ir/ir/irargs.c @@ -1,19 +1,34 @@ /* - * Project: libFIRM - * File name: ir/ir/irargs.c - * Purpose: Support for libcore IR object output. - * Author: Sebastian Hack - * Modified by: - * Created: - * CVS-ID: $Id$ - * Copyright: (c) 1998-2005 Universitaet Karlsruhe - * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. */ +/** + * @file + * @brief Support for libcore IR object output. + * @author Sebastian Hack + * @version $Id$ + */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "firm_config.h" + #ifdef WITH_LIBCORE #include "bitset.h" @@ -32,16 +47,19 @@ * identify a firm object type */ static int firm_get_arg_type(const lc_arg_occ_t *occ) { + (void) occ; /* Firm objects are always pointer */ return lc_arg_type_ptr; } static int firm_get_arg_type_int(const lc_arg_occ_t *occ) { + (void) occ; return lc_arg_type_int; } static int bitset_get_arg_type(const lc_arg_occ_t *occ) { + (void) occ; return lc_arg_type_ptr; } @@ -89,7 +107,7 @@ static int firm_emit_dbg(lc_appendable_t *app, /** * Beware: do not set the entity ld_name */ -static const char *get_entity_ld_name_ex(entity *ent) { +static const char *get_entity_ld_name_ex(ir_entity *ent) { if (ent->ld_name) return get_entity_ld_name(ent); return get_entity_name(ent); @@ -109,8 +127,8 @@ static int firm_emit(lc_appendable_t *app, ir_node *block; char add[64]; char buf[256]; - char tv[256]; - entity *ent; + char tv_buf[256]; + ir_entity *ent; buf[0] = '\0'; add[0] = '\0'; @@ -133,7 +151,10 @@ static int firm_emit(lc_appendable_t *app, 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: @@ -149,25 +170,29 @@ static int firm_emit(lc_appendable_t *app, 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)); @@ -226,10 +251,11 @@ 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 width = occ->width > 0 ? occ->width : 1; + int amount = arg->v_int * width; for(i = 0; i < amount; ++i) - lc_appendable_chadd(app, ' '); + lc_appendable_chadd(app, (i % width) == 0 ? '|' : ' '); return amount; } @@ -248,7 +274,6 @@ static int firm_emit_pnc(lc_appendable_t *app, lc_arg_env_t *firm_get_arg_env(void) { -#define X(name, letter) {"firm:" name, letter} static lc_arg_env_t *env = NULL; @@ -263,6 +288,7 @@ lc_arg_env_t *firm_get_arg_env(void) const char *name; char letter; } args[] = { +#define X(name, letter) {"firm:" name, letter} X("type", 't'), X("entity", 'e'), X("entity_ld", 'E'), @@ -272,11 +298,11 @@ lc_arg_env_t *firm_get_arg_env(void) X("irn_nr", 'N'), X("mode", 'm'), X("block", 'B'), - X("pnc", '='), X("cg_path", 'P'), +#undef X }; - int i; + size_t i; if(env == NULL) { env = lc_arg_new_env(); @@ -286,11 +312,11 @@ lc_arg_env_t *firm_get_arg_env(void) for (i = 0; i < sizeof(args)/sizeof(args[0]); ++i) lc_arg_register(env, args[i].name, args[i].letter, &firm_handler); - lc_arg_register(env, "firm:ident", 'I', &ident_handler); - lc_arg_register(env, "firm:indent", 'D', &indent_handler); - lc_arg_register(env, "firm:pnc", '=', &pnc_handler); + lc_arg_register(env, "firm:ident", 'I', &ident_handler); + lc_arg_register(env, "firm:indent", 'D', &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:bitset", 'B', &bitset_handler); + lc_arg_register(env, "firm:pnc", '=', &pnc_handler); } return env;