X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firvrfy.c;h=30ffea46fa944b9100a01f02e7e154af2d2f9a1d;hb=0952881a2714f8ec2e87a6f4829bd55f41a0c68d;hp=90a8eec5387591dc6c0931bfa3d083bf7e7639df;hpb=55d08ea9493bbce65002f33b6a441f768b237932;p=libfirm diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c index 90a8eec53..30ffea46f 100644 --- a/ir/ir/irvrfy.c +++ b/ir/ir/irvrfy.c @@ -64,7 +64,7 @@ static void show_entity_failure(ir_node *node) fprintf(stderr, "\nFIRM: irn_vrfy_irg() failed\n"); } else { - entity *ent = get_irg_entity(irg); + ir_entity *ent = get_irg_entity(irg); if (ent) { ir_type *ent_type = get_entity_owner(ent); @@ -183,7 +183,7 @@ static void show_proj_mode_failure(ir_node *n, ir_type *ty) /** * Prints a failure message for a proj */ -static void show_proj_failure_ent(ir_node *n, entity *ent) +static void show_proj_failure_ent(ir_node *n, ir_entity *ent) { ir_node *op = get_Proj_pred(n); int proj = get_Proj_proj(n); @@ -232,7 +232,7 @@ static void show_call_param(ir_node *n, ir_type *mt) */ static void show_return_modes(ir_graph *irg, ir_node *n, ir_type *mt, int i) { - entity *ent = get_irg_entity(irg); + ir_entity *ent = get_irg_entity(irg); show_entity_failure(n); fprintf(stderr, " Return node %ld in entity \"%s\" mode %s different from type mode %s\n", @@ -247,7 +247,7 @@ static void show_return_modes(ir_graph *irg, ir_node *n, ir_type *mt, int i) */ static void show_return_nres(ir_graph *irg, ir_node *n, ir_type *mt) { - entity *ent = get_irg_entity(irg); + 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", @@ -278,7 +278,7 @@ static void show_phi_inputs(ir_node *phi, ir_node *block) } /** If the address is Sel or SymConst, return the entity. */ -static entity *get_ptr_entity(ir_node *ptr) { +static ir_entity *get_ptr_entity(ir_node *ptr) { if (get_irn_op(ptr) == op_Sel) { return get_Sel_entity(ptr); } else if ((get_irn_op(ptr) == op_SymConst) && (get_SymConst_kind(ptr) == symconst_addr_ent)) { @@ -300,6 +300,7 @@ static int verify_node_Proj_Start(ir_node *n, ir_node *p) { (proj == pn_Start_M && mode == mode_M) || (proj == pn_Start_P_frame_base && mode_is_reference(mode)) || (proj == pn_Start_P_globals && mode_is_reference(mode)) || + (proj == pn_Start_P_tls && mode_is_reference(mode)) || (proj == pn_Start_T_args && mode == mode_T) || (proj == pn_Start_P_value_arg_base && mode_is_reference(mode)) || (proj == pn_Start_P_value_arg_base && mode == mode_T) /* FIXME: only one of those */ @@ -511,7 +512,7 @@ static int verify_node_Proj_Load(ir_node *n, ir_node *p) { if (proj == pn_Load_res) { ir_node *ptr = get_Load_ptr(n); - entity *ent = get_ptr_entity(ptr); + ir_entity *ent = get_ptr_entity(ptr); if (vrfy_entities && ent && get_irg_phase_state(current_ir_graph) == phase_high) { /* do NOT check this for lowered phases, see comment on Store */ @@ -702,8 +703,9 @@ static int verify_node_Proj_CopyB(ir_node *n, ir_node *p) { long proj = get_Proj_proj(p); ASSERT_AND_RET_DBG( - ((proj == pn_CopyB_M && mode == mode_M) || - (proj == pn_CopyB_X_except && mode == mode_X)), + ((proj == pn_CopyB_M_regular && mode == mode_M) || + (proj == pn_CopyB_X_except && mode == mode_X) || + (proj == pn_CopyB_M_except && mode == mode_M)), "wrong Proj from CopyB", 0, show_proj_failure(p); ); @@ -721,6 +723,9 @@ static int verify_node_Proj_Bound(ir_node *n, ir_node *p) { ir_mode *mode = get_irn_mode(p); long proj = get_Proj_proj(p); + /* ignore Bound checks of Bad */ + if (is_Bad(get_Bound_index(n))) + return 1; ASSERT_AND_RET_DBG( ((proj == pn_Bound_M && mode == mode_M) || (proj == pn_Bound_X_except && mode == mode_X) || @@ -948,7 +953,7 @@ static int verify_node_SymConst(ir_node *n, ir_graph *irg) { ir_mode *mymode = get_irn_mode(n); if (get_SymConst_kind(n) == symconst_addr_ent) { - entity *ent = get_SymConst_entity(n); + ir_entity *ent = get_SymConst_entity(n); if (is_Method_type(get_entity_type(ent)) && get_irn_irg(n) != get_const_code_irg()) { #if 1 @@ -974,7 +979,7 @@ static int verify_node_Sel(ir_node *n, ir_graph *irg) { ir_mode *mymode = get_irn_mode(n); ir_mode *op1mode = get_irn_mode(get_Sel_mem(n)); ir_mode *op2mode = get_irn_mode(get_Sel_ptr(n)); - entity *ent; + ir_entity *ent; ASSERT_AND_RET_DBG( /* Sel: BB x M x ref x int^n --> ref */ @@ -1273,7 +1278,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) && + (mode_is_int(mymode) || mymode == mode_b) && op2mode == op1mode && mymode == op2mode, "And, Or or Eor node", 0, @@ -1425,6 +1430,32 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) { ); } ASSERT_AND_RET( mode_is_dataM(mymode), "Phi node", 0 ); + + if (mymode == mode_M) { + for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) { + int j; + ir_node *pred_i = get_Phi_pred(n, i); + + if (is_Bad(pred_i)) + continue; + for (j = i - 1; j >= 0; --j) { + ir_node *pred_j = get_Phi_pred(n, j); + + if (is_Bad(pred_j)) + continue; +#if 0 + /* currently this checks fails for blocks with exception + outputs (and these are NOT basic blocks). So it is disabled yet. */ + ASSERT_AND_RET_DBG( + (pred_i == pred_j) || (get_irn_n(pred_i, -1) != get_irn_n(pred_j, -1)), + "At least two different PhiM predecessors are in the same block", + 0, + ir_printf("%+F and %+F of %+F are in %+F\n", pred_i, pred_j, n, get_irn_n(pred_i, -1)) + ); +#endif + } + } + } return 1; } @@ -1463,7 +1494,7 @@ static int verify_node_Load(ir_node *n, ir_graph *irg) { * mode_T * { - entity *ent = hunt_for_entity (get_Load_ptr (n), n); + ir_entity *ent = hunt_for_entity (get_Load_ptr (n), n); assert ((NULL != ent) || (mymode != mode_T)); } */ @@ -1475,7 +1506,7 @@ static int verify_node_Load(ir_node *n, ir_graph *irg) { * verify a Store node */ static int verify_node_Store(ir_node *n, ir_graph *irg) { - entity *target; + ir_entity *target; ir_mode *mymode = get_irn_mode(n); ir_mode *op1mode = get_irn_mode(get_Store_mem(n)); @@ -1656,11 +1687,13 @@ static int verify_node_Bound(ir_node *n, ir_graph *irg) { return 1; } -/* +/** * Check dominance. * For each usage of a node, it is checked, if the block of the * node dominates the block of the usage (for phis: the predecessor * block of the phi for the corresponding edge). + * + * @return non-zero on success, 0 on dominance error */ static int check_dominance_for_node(ir_node *use) { @@ -1718,6 +1751,11 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg) show_node_on_graph(irg, n); ); assert(get_irn_irg(n) == irg); + { + unsigned idx = get_irn_idx(n); + ir_node *node_from_map = get_idx_irn(irg, idx); + ASSERT_AND_RET_DBG(node_from_map == n, "Node index and index map entry differ", 0, ir_printf("node %+F node in map %+F(%p)", n, node_from_map, node_from_map)); + } } op = get_irn_op(n); @@ -1805,7 +1843,7 @@ int irg_verify(ir_graph *irg, unsigned flags) current_ir_graph = rem; if (get_node_verification_mode() == FIRM_VERIFICATION_REPORT && ! res) { - entity *ent = get_irg_entity(current_ir_graph); + ir_entity *ent = get_irg_entity(current_ir_graph); if (ent) fprintf(stderr, "irg_verify: Verifying graph %s failed\n", get_entity_name(ent)); @@ -1825,7 +1863,7 @@ int irn_vrfy_irg_dump(ir_node *n, ir_graph *irg, const char **bad_string) firm_vrfy_failure_msg = NULL; do_node_verification(FIRM_VERIFICATION_ERROR_ONLY); res = irn_vrfy_irg(n, irg); - if (! res && get_irg_dom_state(irg) == dom_consistent && + if (res && get_irg_dom_state(irg) == dom_consistent && get_irg_pinned(irg) == op_pin_state_pinned) res = check_dominance_for_node(n); do_node_verification(old); @@ -1951,7 +1989,7 @@ int irg_vrfy_bads(ir_graph *irg, int flags) /* * set the default verify operation */ -void firm_set_default_verifyer(opcode code, ir_op_ops *ops) +void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \