X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=727f5a1d1bbba6d4fa9407708d6677de440cd24f;hb=3d61544bd177bdb8c880ee87f5cdad2b7d1606e5;hp=78c6ca117fb1b61a1e0b14b202be2b5c68b79da9;hpb=d729c062320cea997eb464950d8e0e8205facefa;p=libfirm diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c index 78c6ca117..727f5a1d1 100644 --- a/ir/ir/irverify.c +++ b/ir/ir/irverify.c @@ -21,7 +21,6 @@ * @file * @brief Check irnodes for correctness. * @author Christian Schaefer, Goetz Lindenmaier, Till Riedel, Michael Beck - * @version $Id$ */ #include "config.h" @@ -37,13 +36,13 @@ #include "irflag_t.h" #include "irpass_t.h" #include "irnodeset.h" +#include "ircons.h" /** if this flag is set, verify entity types in Load & Store nodes */ static int verify_entities = 0; const char *firm_verify_failure_msg; -/* enable verification of Load/Store entities */ void verify_enable_entity_tests(int enable) { verify_entities = enable; @@ -656,7 +655,7 @@ static int verify_node_Proj_Proj(const ir_node *p) (proj >= 0 && mode_is_datab(mode)), "wrong Proj from Proj from Call", 0); mt = get_Call_type(pred); - ASSERT_AND_RET(mt == get_unknown_type() || is_Method_type(mt), + ASSERT_AND_RET(is_unknown_type(mt) || is_Method_type(mt), "wrong call type on call", 0); ASSERT_AND_RET( (proj < (int)get_method_n_ress(mt)), @@ -880,12 +879,15 @@ static int verify_node_Cond(const ir_node *n) static int verify_switch_table(const ir_node *n) { const ir_switch_table *table = get_Switch_table(n); - size_t n_entries = ir_switch_table_get_n_entries(table); unsigned n_outs = get_Switch_n_outs(n); ir_node *selector = get_Switch_selector(n); ir_mode *mode = get_irn_mode(selector); + size_t n_entries; size_t e; + ASSERT_AND_RET(table != NULL, "switch table is NULL", 0); + + n_entries = ir_switch_table_get_n_entries(table); for (e = 0; e < n_entries; ++e) { const ir_switch_table_entry *entry = ir_switch_table_get_entry_const(table, e); @@ -1439,7 +1441,7 @@ static int verify_node_Conv(const ir_node *n) ASSERT_AND_RET_DBG(mode_is_data(op1mode) && mode_is_data(mymode), "Conv node", 0, - show_unop_failure(n, "/* Conv: BB x datab --> data */"); + show_unop_failure(n, "/* Conv: BB x data --> data */"); ); return 1; } @@ -1759,7 +1761,6 @@ static int check_dominance_for_node(const ir_node *use) return 1; } -/* Tests the modes of n and its predecessors. */ int irn_verify_irg(const ir_node *n, ir_graph *irg) { ir_op *op; @@ -1802,7 +1803,7 @@ int irn_verify_irg(const ir_node *n, ir_graph *irg) ir_printf("node %+F", n); ); } else if (!is_Block(n) && is_irn_pinned_in_irg(n) - && is_irg_state(irg, IR_GRAPH_STATE_NO_BADS)) { + && irg_has_properties(irg, IR_GRAPH_PROPERTY_NO_BADS)) { ASSERT_AND_RET_DBG(is_Block(get_nodes_block(n)) || is_Anchor(n), "block input is not a block", 0, ir_printf("node %+F", n); @@ -1890,7 +1891,7 @@ static int check_block_cfg(const ir_node *block, check_cfg_env_t *env) branch = skip_Tuple(branch); if (is_Bad(branch)) continue; - former_dest = pmap_get(branch_nodes, branch); + former_dest = pmap_get(ir_node, branch_nodes, branch); ASSERT_AND_RET_DBG(former_dest==NULL || is_unknown_jump(skip_Proj(branch)), "Multiple users on mode_X node", 0, ir_printf("node %+F\n", branch); @@ -1903,7 +1904,7 @@ static int check_block_cfg(const ir_node *block, check_cfg_env_t *env) if (is_Proj(branch)) { branch = skip_Proj(branch); } - former_branch = pmap_get(branch_nodes, branch_block); + former_branch = pmap_get(ir_node, branch_nodes, branch_block); ASSERT_AND_RET_DBG(former_branch == NULL || former_branch == branch, "Multiple branching nodes in a block", 0, @@ -1938,7 +1939,7 @@ static void check_cfg_walk_func(ir_node *node, void *data) static int verify_block_branch(const ir_node *block, check_cfg_env_t *env) { - ir_node *branch = pmap_get(env->branch_nodes, block); + ir_node *branch = pmap_get(ir_node, env->branch_nodes, block); ASSERT_AND_RET_DBG(branch != NULL || ir_nodeset_contains(&env->kept_nodes, block) || block == get_irg_end_block(get_irn_irg(block)), @@ -2028,11 +2029,6 @@ static int check_cfg(ir_graph *irg) return env.res; } -/* - * Calls irn_verify for each node in irg. - * Graph must be in state "op_pin_state_pinned". - * If dominance info is available, check the SSA property. - */ int irg_verify(ir_graph *irg, unsigned flags) { int res = 1; @@ -2051,7 +2047,7 @@ int irg_verify(ir_graph *irg, unsigned flags) irg_walk_anchors( irg, - pinned && is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE) + pinned && irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE) ? verify_wrap_ssa : verify_wrap, NULL, &res @@ -2090,7 +2086,6 @@ static int irg_verify_wrapper(ir_graph *irg, void *context) return 0; } -/* Creates an ir_graph pass for irg_verify(). */ ir_graph_pass_t *irg_verify_pass(const char *name, unsigned flags) { pass_t *pass = XMALLOCZ(pass_t); @@ -2106,7 +2101,6 @@ ir_graph_pass_t *irg_verify_pass(const char *name, unsigned flags) return &pass->pass; } -/* create a verify pass */ int irn_verify_irg_dump(const ir_node *n, ir_graph *irg, const char **bad_string) { @@ -2116,7 +2110,7 @@ int irn_verify_irg_dump(const ir_node *n, ir_graph *irg, firm_verify_failure_msg = NULL; do_node_verification(FIRM_VERIFICATION_ERROR_ONLY); res = irn_verify_irg(n, irg); - if (res && is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE) && + if (res && irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE) && get_irg_pinned(irg) == op_pin_state_pinned) res = check_dominance_for_node(n); do_node_verification(old); @@ -2228,9 +2222,6 @@ static void check_bads(ir_node *node, void *env) } } -/* - * verify occurrence of bad nodes - */ int irg_verify_bads(ir_graph *irg, int flags) { verify_bad_env_t env; @@ -2243,87 +2234,74 @@ int irg_verify_bads(ir_graph *irg, int flags) return env.res; } -/* - * set the default verify operation - */ -void firm_set_default_verifier(unsigned code, ir_op_ops *ops) -{ -#define CASE(a) \ - case iro_##a: \ - ops->verify_node = verify_node_##a; \ - break - - switch (code) { - CASE(Add); - CASE(Alloc); - CASE(And); - CASE(Block); - CASE(Bound); - CASE(Call); - CASE(Cast); - CASE(Cmp); - CASE(Cond); - CASE(Confirm); - CASE(Const); - CASE(Conv); - CASE(CopyB); - CASE(Div); - CASE(Eor); - CASE(Free); - CASE(IJmp); - CASE(InstOf); - CASE(Jmp); - CASE(Load); - CASE(Minus); - CASE(Mod); - CASE(Mul); - CASE(Mulh); - CASE(Mux); - CASE(Not); - CASE(Or); - CASE(Phi); - CASE(Proj); - CASE(Raise); - CASE(Return); - CASE(Rotl); - CASE(Sel); - CASE(Shl); - CASE(Shr); - CASE(Shrs); - CASE(Start); - CASE(Store); - CASE(Sub); - CASE(Switch); - CASE(SymConst); - CASE(Sync); - default: - break; - } -#undef CASE - -#define CASE(a) \ - case iro_##a: \ - ops->verify_proj_node = verify_node_Proj_##a; \ - break - - switch (code) { - CASE(Alloc); - CASE(Bound); - CASE(Call); - CASE(Cond); - CASE(CopyB); - CASE(Div); - CASE(InstOf); - CASE(Load); - CASE(Mod); - CASE(Proj); - CASE(Raise); - CASE(Start); - CASE(Store); - CASE(Switch); - CASE(Tuple); - default: - break; - } -#undef CASE +static void register_verify_node_func(ir_op *op, verify_node_func func) +{ + op->ops.verify_node = func; +} + +static void register_verify_node_func_proj(ir_op *op, verify_node_func func) +{ + op->ops.verify_proj_node = func; +} + +void ir_register_verify_node_ops(void) +{ + register_verify_node_func(op_Add, verify_node_Add); + register_verify_node_func(op_Alloc, verify_node_Alloc); + register_verify_node_func(op_And, verify_node_And); + register_verify_node_func(op_Block, verify_node_Block); + register_verify_node_func(op_Bound, verify_node_Bound); + register_verify_node_func(op_Call, verify_node_Call); + register_verify_node_func(op_Cast, verify_node_Cast); + register_verify_node_func(op_Cmp, verify_node_Cmp); + register_verify_node_func(op_Cond, verify_node_Cond); + register_verify_node_func(op_Confirm, verify_node_Confirm); + register_verify_node_func(op_Const, verify_node_Const); + register_verify_node_func(op_Conv, verify_node_Conv); + register_verify_node_func(op_CopyB, verify_node_CopyB); + register_verify_node_func(op_Div, verify_node_Div); + register_verify_node_func(op_Eor, verify_node_Eor); + register_verify_node_func(op_Free, verify_node_Free); + register_verify_node_func(op_IJmp, verify_node_IJmp); + register_verify_node_func(op_InstOf, verify_node_InstOf); + register_verify_node_func(op_Jmp, verify_node_Jmp); + register_verify_node_func(op_Load, verify_node_Load); + register_verify_node_func(op_Minus, verify_node_Minus); + register_verify_node_func(op_Mod, verify_node_Mod); + register_verify_node_func(op_Mul, verify_node_Mul); + register_verify_node_func(op_Mulh, verify_node_Mulh); + register_verify_node_func(op_Mux, verify_node_Mux); + register_verify_node_func(op_Not, verify_node_Not); + register_verify_node_func(op_Or, verify_node_Or); + register_verify_node_func(op_Phi, verify_node_Phi); + register_verify_node_func(op_Proj, verify_node_Proj); + register_verify_node_func(op_Raise, verify_node_Raise); + register_verify_node_func(op_Return, verify_node_Return); + register_verify_node_func(op_Rotl, verify_node_Rotl); + register_verify_node_func(op_Sel, verify_node_Sel); + register_verify_node_func(op_Shl, verify_node_Shl); + register_verify_node_func(op_Shr, verify_node_Shr); + register_verify_node_func(op_Shrs, verify_node_Shrs); + register_verify_node_func(op_Start, verify_node_Start); + register_verify_node_func(op_Store, verify_node_Store); + register_verify_node_func(op_Sub, verify_node_Sub); + register_verify_node_func(op_Switch, verify_node_Switch); + register_verify_node_func(op_SymConst, verify_node_SymConst); + register_verify_node_func(op_Sync, verify_node_Sync); + + register_verify_node_func_proj(op_Alloc, verify_node_Proj_Alloc); + register_verify_node_func_proj(op_Bound, verify_node_Proj_Bound); + register_verify_node_func_proj(op_Call, verify_node_Proj_Call); + register_verify_node_func_proj(op_Cond, verify_node_Proj_Cond); + register_verify_node_func_proj(op_CopyB, verify_node_Proj_CopyB); + register_verify_node_func_proj(op_Div, verify_node_Proj_Div); + register_verify_node_func_proj(op_InstOf, verify_node_Proj_InstOf); + register_verify_node_func_proj(op_Load, verify_node_Proj_Load); + register_verify_node_func_proj(op_Mod, verify_node_Proj_Mod); + register_verify_node_func_proj(op_Proj, verify_node_Proj_Proj); + register_verify_node_func_proj(op_Raise, verify_node_Proj_Raise); + register_verify_node_func_proj(op_Start, verify_node_Proj_Start); + register_verify_node_func_proj(op_Store, verify_node_Proj_Store); + register_verify_node_func_proj(op_Switch, verify_node_Proj_Switch); + register_verify_node_func_proj(op_Tuple, verify_node_Proj_Tuple); }