From: Florian Liekweg Date: Mon, 18 Oct 2004 12:48:38 +0000 (+0000) Subject: avoid warning X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=ad39867c53fbb3be1768aadcbe0231487084fc9d;p=libfirm avoid warning [r4142] --- diff --git a/ir/ana/rta.c b/ir/ana/rta.c index 11dfbc100..bcee4f3b0 100644 --- a/ir/ana/rta.c +++ b/ir/ana/rta.c @@ -7,7 +7,7 @@ * Author: Florian * Modified by: * Created: 09.06.2002 - * CVS-ID: $$ + * CVS-ID: $Id$ * Copyright: (c) 1999-2004 Universität Karlsruhe * Licence: This file is protected by GPL - GNU GENERAL PUBLIC LICENSE. */ @@ -43,8 +43,10 @@ #include "irvrfy.h" #include "trvrfy.h" -# define TRUE 1 -# define FALSE 0 +# ifndef TRUE +# define TRUE 1 +# define FALSE 0 +# endif /* not defined TRUE */ /* flags */ static int verbose = 0; @@ -78,7 +80,7 @@ static ir_graph *get_implementing_graph (entity *method) /* GL this is not valid in our remove irg algorithm ... which we removed by now ... */ assert(get_entity_peculiarity(method) == peculiarity_description - || graph == get_entity_irg(get_SymConst_entity(get_atomic_ent_value(method)))); + || graph == get_entity_irg(get_SymConst_entity(get_atomic_ent_value(method)))); /* we *must* always return a graph != NULL, *except* when we're used inside remove_irg or force_description */ @@ -184,21 +186,21 @@ static void rta_act (ir_node *node, void *env) /* CALL SYMCONST */ } else if (iro_SymConst == get_irn_opcode (ptr)) { if (get_SymConst_kind(ptr) == symconst_addr_ent) { - ent = get_SymConst_entity (ptr); - ir_graph *graph = get_entity_irg (ent); - if (graph) { - *change |= add_graph (graph); - } else { - /* it's an external allocated thing. */ - } + ent = get_SymConst_entity (ptr); + ir_graph *graph = get_entity_irg (ent); + if (graph) { + *change |= add_graph (graph); + } else { + /* it's an external allocated thing. */ + } } else if (get_SymConst_kind(ptr) == symconst_addr_name) { - /* If this SymConst refers to a method the method is external_visible - and therefore must be considered live anyways. */ - if (get_SymConst_name(ptr) != new_id_from_str("iro_Catch")) - assert (ent && "couldn't determine entity of call to symConst"); + /* If this SymConst refers to a method the method is external_visible + and therefore must be considered live anyways. */ + if (get_SymConst_name(ptr) != new_id_from_str("iro_Catch")) + assert (ent && "couldn't determine entity of call to symConst"); } else { - /* other symconst. */ - assert(0 && "This SymConst can not be an address for a method call."); + /* other symconst. */ + assert(0 && "This SymConst can not be an address for a method call."); } /* STRANGE */ @@ -423,12 +425,12 @@ static void make_entity_to_description(type_or_ent *tore, void *env) { entity *ent = (entity *)tore; if ((is_method_type(get_entity_type(ent))) && - (get_entity_peculiarity(ent) != peculiarity_description) && - (get_entity_visibility(ent) != visibility_external_allocated) ) { + (get_entity_peculiarity(ent) != peculiarity_description) && + (get_entity_visibility(ent) != visibility_external_allocated) ) { ir_graph *irg = get_entity_irg(get_SymConst_entity(get_atomic_ent_value(ent))); if (!eset_contains (_live_graphs, irg)) { - set_entity_peculiarity(ent, peculiarity_description); - set_entity_irg(ent, NULL); + set_entity_peculiarity(ent, peculiarity_description); + set_entity_irg(ent, NULL); } } } @@ -531,6 +533,9 @@ void rta_report (void) /* * $Log$ + * Revision 1.25 2004/10/18 12:47:08 liekweg + * avoid warning + * * Revision 1.24 2004/09/24 13:59:04 beck * fixed doxygen comments, removed initialization for description entities * diff --git a/ir/external/read.c b/ir/external/read.c index e457503d5..b42620537 100644 --- a/ir/external/read.c +++ b/ir/external/read.c @@ -720,7 +720,7 @@ void extern_cleanup () } -void test_getEffectByName () +void test_getEffectByName (void) { /* test getEffectByName */ char *names [] = { @@ -757,6 +757,9 @@ void test_getEffectByName () /* * $Log$ + * Revision 1.5 2004/10/18 12:48:20 liekweg + * avoid warning + * * Revision 1.4 2004/10/14 11:31:53 liekweg * ... * diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c index ccb134a20..46fc90c56 100644 --- a/ir/ir/irdump.c +++ b/ir/ir/irdump.c @@ -715,9 +715,9 @@ static INLINE int dump_node_info(FILE *F, ir_node *n) int i, n_cfgpreds = get_Block_cg_n_cfgpreds(sbl); fprintf(F, "graph has %d interprocedural predecessors:\n", n_cfgpreds); for (i = 0; i < n_cfgpreds; ++i) { - ir_node *cfgpred = get_Block_cg_cfgpred(sbl, i); - fprintf(F, " %d: Call %ld in graph %s\n", i, get_irn_node_nr(cfgpred), - get_irg_dump_name(get_irn_irg(cfgpred))); + ir_node *cfgpred = get_Block_cg_cfgpred(sbl, i); + fprintf(F, " %d: Call %ld in graph %s\n", i, get_irn_node_nr(cfgpred), + get_irg_dump_name(get_irn_irg(cfgpred))); } } } break; @@ -749,11 +749,11 @@ static INLINE int dump_node_info(FILE *F, ir_node *n) if (Call_has_callees(n)) { fprintf(F, "possible callees: \n"); for (i = 0; i < get_Call_n_callees(n); i++) { - if (!get_Call_callee(n, i)) { - fprintf(F, " %d external method\n", i); - } else { - fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); - } + if (!get_Call_callee(n, i)) { + fprintf(F, " %d external method\n", i); + } else { + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); + } } } } break; @@ -1762,7 +1762,7 @@ dump_vcg_header(FILE *F, const char *name, const char *orientation) { "colorentry 123: 255 220 220\n" "colorentry 124: 255 240 240\n" "colorentry 125: 255 250 250\n" - ); + ); fprintf (F, "\n"); /* a separator */ } @@ -2037,10 +2037,10 @@ dump_block_to_cfg(ir_node *block, void *env) { for (fl = i = 0; i < get_Block_n_cfgpreds(block); ++i) { ir_node *pred = get_Block_cfgpred(block, i); if (is_Bad(pred)) { - if (! fl) - fprintf(F, "Bad pred at pos: "); - fprintf(F, "%d ", i); - fl = 1; + if (! fl) + fprintf(F, "Bad pred at pos: "); + fprintf(F, "%d ", i); + fl = 1; } } if (fl) @@ -2049,7 +2049,7 @@ dump_block_to_cfg(ir_node *block, void *env) { fprintf (F, "\""); /* closing quote of info */ if ((block == get_irg_start_block(get_irn_irg(block))) || - (block == get_irg_end_block(get_irn_irg(block))) ) + (block == get_irg_end_block(get_irn_irg(block))) ) fprintf(F, " color:blue "); else if (fl) fprintf(F, " color:yellow "); @@ -2145,8 +2145,8 @@ static int get_entity_color(entity *ent) { int max_loop_depth = irp->max_callgraph_loop_depth; int max_overall_depth = weight_overall(max_rec_depth, max_loop_depth); - int my_rec_color = compute_color(rec_depth, max_rec_depth); - int my_loop_color = compute_color(loop_depth, max_loop_depth); + /* int my_rec_color = compute_color(rec_depth, max_rec_depth); */ + /* int my_loop_color = compute_color(loop_depth, max_loop_depth); */ int my_overall_color = compute_color(overall_depth, max_overall_depth);; return my_overall_color; @@ -2329,15 +2329,15 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) { int bad = 0; if (!loop_node_started) { - /* Start a new node which contains all firm nodes of the current loop */ - fprintf (F, "node: { title: \""); - PRINT_LOOPID(loop); - fprintf (F, "-%d-nodes\" color: lightyellow label: \"", i); - loop_node_started = 1; - first = i; + /* Start a new node which contains all firm nodes of the current loop */ + fprintf (F, "node: { title: \""); + PRINT_LOOPID(loop); + fprintf (F, "-%d-nodes\" color: lightyellow label: \"", i); + loop_node_started = 1; + first = i; } else - fprintf(F, "\n"); + fprintf(F, "\n"); bad |= dump_node_opcode(F, n); bad |= dump_node_mode(F, n); @@ -2351,15 +2351,15 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) { /* We are a loop node -> Collect firm graphs */ ir_graph *n = (ir_graph *)le.node; if (!loop_node_started) { - /* Start a new node which contains all firm nodes of the current loop */ - fprintf (F, "node: { title: \""); - PRINT_LOOPID(loop); - fprintf (F, "-%d-nodes\" color: lightyellow label: \"", i); - loop_node_started = 1; - first = i; + /* Start a new node which contains all firm nodes of the current loop */ + fprintf (F, "node: { title: \""); + PRINT_LOOPID(loop); + fprintf (F, "-%d-nodes\" color: lightyellow label: \"", i); + loop_node_started = 1; + first = i; } else - fprintf(F, "\n"); + fprintf(F, "\n"); fprintf (F, " %s", get_irg_dump_name(n)); /* fprintf (F, " %s (depth %d)", get_irg_dump_name(n), n->callgraph_weighted_loop_depth); */ }