X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=c093b921ccbce13e0c3e4e6eabf2bea15ff79d8a;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=32568ba6f3e3324e7d018d992102a4064892e8ae;hpb=a1e9069afa4fa1e16e2d176bcd7905d6a1ed4677;p=libfirm diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c index 32568ba6f..c093b921c 100644 --- a/ir/ir/irverify.c +++ b/ir/ir/irverify.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2010 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -97,6 +97,12 @@ static void show_entity_failure(ir_node *node) } } +static const char *get_irn_modename(const ir_node *node) +{ + ir_mode *mode = get_irn_mode(node); + return get_mode_name(mode); +} + /** * Prints a failure for a Node */ @@ -227,7 +233,7 @@ static void show_node_on_graph(ir_graph *irg, ir_node *n) */ static void show_call_param(ir_node *n, ir_type *mt) { - int i; + size_t i; char type_name[256]; ir_print_type(type_name, sizeof(type_name), mt); @@ -267,9 +273,10 @@ static void show_return_nres(ir_graph *irg, ir_node *n, ir_type *mt) ir_entity *ent = get_irg_entity(irg); show_entity_failure(n); - fprintf(stderr, " Return node %ld in entity \"%s\" has %d results different from type %d\n", + fprintf(stderr, " Return node %ld in entity \"%s\" has %lu results different from type %lu\n", get_irn_node_nr(n), get_entity_name(ent), - get_Return_n_ress(n), get_method_n_ress(mt)); + (unsigned long) get_Return_n_ress(n), + (unsigned long) get_method_n_ress(mt)); } /** @@ -326,7 +333,6 @@ static int verify_node_Proj_Start(ir_node *n, ir_node *p) (proj == pn_Start_X_initial_exec && mode == mode_X) || (proj == pn_Start_M && mode == mode_M) || (proj == pn_Start_P_frame_base && mode_is_reference(mode)) || - (proj == pn_Start_P_tls && mode_is_reference(mode)) || (proj == pn_Start_T_args && mode == mode_T) ), "wrong Proj from Start", 0, @@ -407,8 +413,7 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p) (proj == pn_Call_M && mode == mode_M) || (proj == pn_Call_X_regular && mode == mode_X) || (proj == pn_Call_X_except && mode == mode_X) || - (proj == pn_Call_T_result && mode == mode_T) || - (proj == pn_Call_P_value_res_base && mode_is_reference(mode)) + (proj == pn_Call_T_result && mode == mode_T) ), "wrong Proj from Call", 0, show_proj_failure(p); @@ -425,73 +430,6 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p) return 1; } -/** - * verify a Proj(Quot) node - */ -static int verify_node_Proj_Quot(ir_node *n, ir_node *p) -{ - ir_mode *mode = get_irn_mode(p); - long proj = get_Proj_proj(p); - - ASSERT_AND_RET_DBG( - ( - (proj == pn_Quot_M && mode == mode_M) || - (proj == pn_Quot_X_regular && mode == mode_X) || - (proj == pn_Quot_X_except && mode == mode_X) || - (proj == pn_Quot_res && mode_is_float(mode) && mode == get_Quot_resmode(n)) - ), - "wrong Proj from Quot", 0, - show_proj_failure(p); - ); - if (proj == pn_Quot_X_regular) - ASSERT_AND_RET( - get_irn_pinned(n) == op_pin_state_pinned, - "Regular Proj from unpinned Quot", 0); - else if (proj == pn_Quot_X_except) - ASSERT_AND_RET( - get_irn_pinned(n) == op_pin_state_pinned, - "Exception Proj from unpinned Quot", 0); - else if (proj == pn_Quot_M) - ASSERT_AND_RET( - get_irn_pinned(n) == op_pin_state_pinned, - "Memory Proj from unpinned Quot", 0); - return 1; -} - -/** - * verify a Proj(DivMod) node - */ -static int verify_node_Proj_DivMod(ir_node *n, ir_node *p) -{ - ir_mode *mode = get_irn_mode(p); - long proj = get_Proj_proj(p); - - ASSERT_AND_RET_DBG( - ( - (proj == pn_DivMod_M && mode == mode_M) || - (proj == pn_DivMod_X_regular && mode == mode_X) || - (proj == pn_DivMod_X_except && mode == mode_X) || - (proj == pn_DivMod_res_div && mode_is_int(mode) && mode == get_DivMod_resmode(n)) || - (proj == pn_DivMod_res_mod && mode_is_int(mode) && mode == get_DivMod_resmode(n)) - ), - "wrong Proj from DivMod", 0, - show_proj_failure(p); - ); - if (proj == pn_DivMod_X_regular) - ASSERT_AND_RET( - get_irn_pinned(n) == op_pin_state_pinned, - "Regular Proj from unpinned DivMod", 0); - else if (proj == pn_DivMod_X_except) - ASSERT_AND_RET( - get_irn_pinned(n) == op_pin_state_pinned, - "Exception Proj from unpinned DivMod", 0); - else if (proj == pn_DivMod_M) - ASSERT_AND_RET( - get_irn_pinned(n) == op_pin_state_pinned, - "Memory Proj from unpinned DivMod", 0); - return 1; -} - /** * verify a Proj(Div) node */ @@ -505,7 +443,7 @@ static int verify_node_Proj_Div(ir_node *n, ir_node *p) (proj == pn_Div_M && mode == mode_M) || (proj == pn_Div_X_regular && mode == mode_X) || (proj == pn_Div_X_except && mode == mode_X) || - (proj == pn_Div_res && mode_is_int(mode) && mode == get_Div_resmode(n)) + (proj == pn_Div_res && mode_is_data(mode) && mode == get_Div_resmode(n)) ), "wrong Proj from Div", 0, show_proj_failure(p); @@ -538,7 +476,7 @@ static int verify_node_Proj_Mod(ir_node *n, ir_node *p) (proj == pn_Mod_M && mode == mode_M) || (proj == pn_Mod_X_regular && mode == mode_X) || (proj == pn_Mod_X_except && mode == mode_X) || - (proj == pn_Mod_res && mode_is_int(mode) && mode == get_Mod_resmode(n)) + (proj == pn_Mod_res && mode == get_Mod_resmode(n)) ), "wrong Proj from Mod", 0, show_proj_failure(p); @@ -558,28 +496,6 @@ static int verify_node_Proj_Mod(ir_node *n, ir_node *p) return 1; } -/** - * verify a Proj(Cmp) node - */ -static int verify_node_Proj_Cmp(ir_node *n, ir_node *p) -{ - ir_mode *mode = get_irn_mode(p); - long proj = get_Proj_proj(p); - (void) n; - - ASSERT_AND_RET_DBG( - (proj >= 0 && proj <= 15 && mode == mode_b), - "wrong Proj from Cmp", 0, - show_proj_failure(p); - ); - ASSERT_AND_RET_DBG( - (mode_is_float(get_irn_mode(get_Cmp_left(n))) || !(proj & pn_Cmp_Uo)), - "unordered Proj for non-float Cmp", 0, - show_proj_failure(p); - ); - return 1; -} - /** * verify a Proj(Load) node */ @@ -589,10 +505,11 @@ static int verify_node_Proj_Load(ir_node *n, ir_node *p) long proj = get_Proj_proj(p); if (proj == pn_Load_res) { - ir_node *ptr = get_Load_ptr(n); + ir_node *ptr = get_Load_ptr(n); ir_entity *ent = get_ptr_entity(ptr); + ir_graph *irg = get_irn_irg(n); - if (verify_entities && ent && get_irg_phase_state(current_ir_graph) == phase_high) { + if (verify_entities && ent && get_irg_phase_state(irg) == phase_high) { /* do NOT check this for lowered phases, see comment on Store */ ASSERT_AND_RET_DBG( (mode == get_type_mode(get_entity_type(ent))), @@ -704,7 +621,7 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p) (proj >= 0 && mode_is_datab(mode)), "wrong Proj from Proj from Start", 0); ASSERT_AND_RET( - (proj < get_method_n_params(mt)), + (proj < (int)get_method_n_params(mt)), "More Projs for args than args in type", 0 ); if ((mode_is_reference(mode)) && is_compound_type(get_method_param_type(mt, proj))) @@ -729,7 +646,7 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p) ASSERT_AND_RET(mt == get_unknown_type() || is_Method_type(mt), "wrong call type on call", 0); ASSERT_AND_RET( - (proj < get_method_n_ress(mt)), + (proj < (int)get_method_n_ress(mt)), "More Projs for results than results in type.", 0); if ((mode_is_reference(mode)) && is_compound_type(get_method_res_type(mt, proj))) /* value result */ break; @@ -963,7 +880,7 @@ static int verify_node_Return(ir_node *n, ir_graph *irg) ASSERT_AND_RET( mymode == mode_X, "Result X", 0 ); /* result X */ /* Compare returned results with result types of method type */ mt = get_entity_type(get_irg_entity(irg)); - ASSERT_AND_RET_DBG( get_Return_n_ress(n) == get_method_n_ress(mt), + ASSERT_AND_RET_DBG(get_Return_n_ress(n) == get_method_n_ress(mt), "Number of results for Return doesn't match number of results in type.", 0, show_return_nres(irg, n, mt);); for (i = get_Return_n_ress(n) - 1; i >= 0; --i) { @@ -1111,7 +1028,8 @@ static int verify_node_Call(ir_node *n, ir_graph *irg) ir_mode *op1mode = get_irn_mode(get_Call_mem(n)); ir_mode *op2mode = get_irn_mode(get_Call_ptr(n)); ir_type *mt; - int i; + size_t i; + size_t n_params; (void) irg; /* Call: BB x M x ref x data1 x ... x datan @@ -1126,7 +1044,8 @@ static int verify_node_Call(ir_node *n, ir_graph *irg) return 1; } - for (i = get_Call_n_params(n) - 1; i >= 0; --i) { + n_params = get_Call_n_params(n); + for (i = 0; i < n_params; ++i) { ASSERT_AND_RET( mode_is_datab(get_irn_mode(get_Call_param(n, i))), "Call node", 0 ); /* operand datai */ } @@ -1299,50 +1218,6 @@ static int verify_node_Mulh(ir_node *n, ir_graph *irg) return 1; } -/** - * verify a Quot node - */ -static int verify_node_Quot(ir_node *n, ir_graph *irg) -{ - ir_mode *mymode = get_irn_mode(n); - ir_mode *op1mode = get_irn_mode(get_Quot_mem(n)); - ir_mode *op2mode = get_irn_mode(get_Quot_left(n)); - ir_mode *op3mode = get_irn_mode(get_Quot_right(n)); - (void) irg; - - ASSERT_AND_RET_DBG( - /* Quot: BB x M x float x float --> M x X x float */ - op1mode == mode_M && op2mode == op3mode && - get_mode_sort(op2mode) == irms_float_number && - mymode == mode_T, - "Quot node",0, - show_binop_failure(n, "/* Quot: BB x M x float x float --> M x X x float */"); - ); - return 1; -} - -/** - * verify a DivMod node - */ -static int verify_node_DivMod(ir_node *n, ir_graph *irg) -{ - ir_mode *mymode = get_irn_mode(n); - ir_mode *op1mode = get_irn_mode(get_DivMod_mem(n)); - ir_mode *op2mode = get_irn_mode(get_DivMod_left(n)); - ir_mode *op3mode = get_irn_mode(get_DivMod_right(n)); - (void) irg; - - ASSERT_AND_RET( - /* DivMod: BB x M x int x int --> M x X x int x int */ - op1mode == mode_M && - mode_is_int(op2mode) && - op3mode == op2mode && - mymode == mode_T, - "DivMod node", 0 - ); - return 1; -} - /** * verify a Div node */ @@ -1355,10 +1230,10 @@ static int verify_node_Div(ir_node *n, ir_graph *irg) (void) irg; ASSERT_AND_RET( - /* Div: BB x M x int x int --> M x X x int */ + /* Div: BB x M x data x data --> M x X x data */ op1mode == mode_M && op2mode == op3mode && - mode_is_int(op2mode) && + mode_is_data(op2mode) && mymode == mode_T, "Div node", 0 ); @@ -1399,7 +1274,7 @@ static int verify_node_Logic(ir_node *n, ir_graph *irg) ASSERT_AND_RET_DBG( /* And or Or or Eor: BB x int x int --> int */ - (mode_is_int(mymode) || mymode == mode_b) && + (mode_is_int(mymode) || mode_is_reference(mymode) || mymode == mode_b) && op2mode == op1mode && mymode == op2mode, "And, Or or Eor node", 0, @@ -1445,7 +1320,7 @@ static int verify_node_Cmp(ir_node *n, ir_graph *irg) /* Cmp: BB x datab x datab --> b16 */ mode_is_datab(op1mode) && op2mode == op1mode && - mymode == mode_T, + mymode == mode_b, "Cmp node", 0, show_binop_failure(n, "/* Cmp: BB x datab x datab --> b16 */"); ); @@ -1649,7 +1524,7 @@ static int verify_node_Store(ir_node *n, ir_graph *irg) ASSERT_AND_RET(mymode == mode_T, "Store node", 0); target = get_ptr_entity(get_Store_ptr(n)); - if (verify_entities && target && get_irg_phase_state(current_ir_graph) == phase_high) { + if (verify_entities && target && get_irg_phase_state(irg) == phase_high) { /* * If lowered code, any Sels that add 0 may be removed, causing * an direct access to entities of array or compound type. @@ -1836,6 +1711,7 @@ static int check_dominance_for_node(ir_node *use) ir_node *def = get_irn_n(use, i); ir_node *def_bl = get_nodes_block(def); ir_node *use_bl = bl; + ir_graph *irg; /* ignore dead definition blocks, will be removed */ if (is_Block_dead(def_bl) || get_Block_dom_depth(def_bl) == -1) @@ -1848,12 +1724,13 @@ static int check_dominance_for_node(ir_node *use) if (is_Block_dead(use_bl) || get_Block_dom_depth(use_bl) == -1) continue; + irg = get_irn_irg(use); ASSERT_AND_RET_DBG( block_dominates(def_bl, use_bl), "the definition of a value used violates the dominance property", 0, ir_fprintf(stderr, "graph %+F: %+F of %+F must dominate %+F of user %+F input %d\n", - current_ir_graph, def_bl, def, use_bl, use, i + irg, def_bl, def, use_bl, use, i ); ); } @@ -1923,7 +1800,7 @@ int irn_verify_irg(ir_node *n, ir_graph *irg) int irn_verify(ir_node *n) { #ifdef DEBUG_libfirm - return irn_verify_irg(n, current_ir_graph); + return irn_verify_irg(n, get_irn_irg(n)); #else (void)n; return 1; @@ -1940,8 +1817,8 @@ int irn_verify(ir_node *n) */ static void verify_wrap(ir_node *node, void *env) { - int *res = env; - *res = irn_verify_irg(node, current_ir_graph); + int *res = (int*)env; + *res = irn_verify_irg(node, get_irn_irg(node)); } /** @@ -1950,9 +1827,9 @@ static void verify_wrap(ir_node *node, void *env) */ static void verify_wrap_ssa(ir_node *node, void *env) { - int *res = env; + int *res = (int*)env; - *res = irn_verify_irg(node, current_ir_graph); + *res = irn_verify_irg(node, get_irn_irg(node)); if (*res) { *res = check_dominance_for_node(node); } @@ -1969,25 +1846,21 @@ int irg_verify(ir_graph *irg, unsigned flags) { int res = 1; #ifdef DEBUG_libfirm - ir_graph *rem; - - rem = current_ir_graph; - current_ir_graph = irg; + int pinned = get_irg_pinned(irg) == op_pin_state_pinned; #ifndef NDEBUG - last_irg_error = NULL; + last_irg_error = NULL; #endif /* NDEBUG */ - assert(get_irg_pinned(irg) == op_pin_state_pinned && "Verification need pinned graph"); - - if (flags & VERIFY_ENFORCE_SSA) + if ((flags & VERIFY_ENFORCE_SSA) && pinned) compute_doms(irg); irg_walk_anchors( irg, - get_irg_dom_state(irg) == dom_consistent && - get_irg_pinned(irg) == op_pin_state_pinned ? verify_wrap_ssa : verify_wrap, - NULL, &res + pinned && get_irg_dom_state(irg) == dom_consistent + ? verify_wrap_ssa : verify_wrap, + NULL, + &res ); if (get_node_verification_mode() == FIRM_VERIFICATION_REPORT && ! res) { @@ -1999,7 +1872,6 @@ int irg_verify(ir_graph *irg, unsigned flags) fprintf(stderr, "irg_verify: Verifying graph %p failed\n", (void *)irg); } - current_ir_graph = rem; #else (void)irg; (void)flags; @@ -2008,17 +1880,17 @@ int irg_verify(ir_graph *irg, unsigned flags) return res; } -struct pass_t { +typedef struct pass_t { ir_graph_pass_t pass; unsigned flags; -}; +} pass_t; /** * Wrapper to irg_verify to be run as an ir_graph pass. */ static int irg_verify_wrapper(ir_graph *irg, void *context) { - struct pass_t *pass = context; + pass_t *pass = (pass_t*)context; irg_verify(irg, pass->flags); /* do NOT rerun the pass if verify is ok :-) */ return 0; @@ -2027,7 +1899,7 @@ static int irg_verify_wrapper(ir_graph *irg, void *context) /* Creates an ir_graph pass for irg_verify(). */ ir_graph_pass_t *irg_verify_pass(const char *name, unsigned flags) { - struct pass_t *pass = XMALLOCZ(struct pass_t); + pass_t *pass = XMALLOCZ(pass_t); def_graph_pass_constructor( &pass->pass, name ? name : "irg_verify", irg_verify_wrapper); @@ -2068,8 +1940,9 @@ typedef struct verify_bad_env_t { */ static void check_bads(ir_node *node, void *env) { - verify_bad_env_t *venv = env; + verify_bad_env_t *venv = (verify_bad_env_t*)env; int i, arity = get_irn_arity(node); + ir_graph *irg = get_irn_irg(node); if (is_Block(node)) { if ((venv->flags & BAD_CF) == 0) { @@ -2085,7 +1958,7 @@ static void check_bads(ir_node *node, void *env) fprintf(stderr, "irg_verify_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node)); } if (get_node_verification_mode() == FIRM_VERIFICATION_ON) { - dump_ir_graph(current_ir_graph, "-assert"); + dump_ir_graph(irg, "-assert"); assert(0 && "Bad CF detected"); } } @@ -2102,7 +1975,7 @@ static void check_bads(ir_node *node, void *env) fprintf(stderr, "irg_verify_bads: node %ld has Bad Block\n", get_irn_node_nr(node)); } if (get_node_verification_mode() == FIRM_VERIFICATION_ON) { - dump_ir_graph(current_ir_graph, "-assert"); + dump_ir_graph(irg, "-assert"); assert(0 && "Bad CF detected"); } } @@ -2116,7 +1989,7 @@ static void check_bads(ir_node *node, void *env) fprintf(stderr, "irg_verify_bads: node %ld is a Tuple\n", get_irn_node_nr(node)); } if (get_node_verification_mode() == FIRM_VERIFICATION_ON) { - dump_ir_graph(current_ir_graph, "-assert"); + dump_ir_graph(irg, "-assert"); assert(0 && "Tuple detected"); } } @@ -2137,7 +2010,7 @@ static void check_bads(ir_node *node, void *env) fprintf(stderr, "irg_verify_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node)); } if (get_node_verification_mode() == FIRM_VERIFICATION_ON) { - dump_ir_graph(current_ir_graph, "-assert"); + dump_ir_graph(irg, "-assert"); assert(0 && "Bad CF detected"); } } @@ -2151,7 +2024,7 @@ static void check_bads(ir_node *node, void *env) fprintf(stderr, "irg_verify_bads: node %ld has Bad Input\n", get_irn_node_nr(node)); } if (get_node_verification_mode() == FIRM_VERIFICATION_ON) { - dump_ir_graph(current_ir_graph, "-assert"); + dump_ir_graph(irg, "-assert"); assert(0 && "Bad NON-CF detected"); } } @@ -2178,7 +2051,7 @@ int irg_verify_bads(ir_graph *irg, int flags) /* * set the default verify operation */ -void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops) +void firm_set_default_verifier(unsigned code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \ @@ -2204,8 +2077,6 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops) CASE(Minus); CASE(Mul); CASE(Mulh); - CASE(Quot); - CASE(DivMod); CASE(Div); CASE(Mod); CASE(And); @@ -2245,11 +2116,8 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops) CASE(Raise); CASE(InstOf); CASE(Call); - CASE(Quot); - CASE(DivMod); CASE(Div); CASE(Mod); - CASE(Cmp); CASE(Load); CASE(Store); CASE(Alloc);