Commit a8583be0 by sebastian.buchwald1

Fix indentation

parent 52e16f28
 ... @@ -49,7 +49,7 @@ static void pqueue_heapify(pqueue_t *q, size_t pos) ... @@ -49,7 +49,7 @@ static void pqueue_heapify(pqueue_t *q, size_t pos) exchange = pos * 2; exchange = pos * 2; if ((pos * 2 + 1) < len if ((pos * 2 + 1) < len && q->elems[exchange].priority < q->elems[pos * 2 + 1].priority) && q->elems[exchange].priority < q->elems[pos * 2 + 1].priority) exchange = pos * 2 + 1; exchange = pos * 2 + 1; if (exchange == pos) if (exchange == pos) ... ...
 ... @@ -665,7 +665,7 @@ undefined: ... @@ -665,7 +665,7 @@ undefined: switch (relation) { switch (relation) { case ir_relation_less_greater: case ir_relation_less_greater: if (!tarval_is_null(tarval_andnot(ro, lz)) || if (!tarval_is_null(tarval_andnot(ro, lz)) || !tarval_is_null(tarval_andnot(lo, rz))) { !tarval_is_null(tarval_andnot(lo, rz))) { // At least one bit differs. // At least one bit differs. z = o = t; z = o = t; } else if (lz == lo && rz == ro && lz == rz) { } else if (lz == lo && rz == ro && lz == rz) { ... @@ -677,7 +677,7 @@ undefined: ... @@ -677,7 +677,7 @@ undefined: case ir_relation_equal: case ir_relation_equal: if (!tarval_is_null(tarval_andnot(ro, lz)) || if (!tarval_is_null(tarval_andnot(ro, lz)) || !tarval_is_null(tarval_andnot(lo, rz))) { !tarval_is_null(tarval_andnot(lo, rz))) { // At least one bit differs. // At least one bit differs. z = o = f; z = o = f; } else if (lz == lo && rz == ro && lz == rz) { } else if (lz == lo && rz == ro && lz == rz) { ... @@ -691,7 +691,7 @@ undefined: ... @@ -691,7 +691,7 @@ undefined: case ir_relation_less: case ir_relation_less: /* TODO handle negative values */ /* TODO handle negative values */ if (tarval_is_negative(lz) || tarval_is_negative(lo) || if (tarval_is_negative(lz) || tarval_is_negative(lo) || tarval_is_negative(rz) || tarval_is_negative(ro)) tarval_is_negative(rz) || tarval_is_negative(ro)) goto result_unknown; goto result_unknown; if (tarval_cmp(lz, ro) & relation) { if (tarval_cmp(lz, ro) & relation) { ... @@ -709,7 +709,7 @@ undefined: ... @@ -709,7 +709,7 @@ undefined: case ir_relation_greater: case ir_relation_greater: /* TODO handle negative values */ /* TODO handle negative values */ if (tarval_is_negative(lz) || tarval_is_negative(lo) || if (tarval_is_negative(lz) || tarval_is_negative(lo) || tarval_is_negative(rz) || tarval_is_negative(ro)) tarval_is_negative(rz) || tarval_is_negative(ro)) goto result_unknown; goto result_unknown; if (!(tarval_cmp(lz, ro) & relation)) { if (!(tarval_cmp(lz, ro) & relation)) { ... ...
 ... @@ -170,8 +170,8 @@ static void dca_transfer(ir_node *irn) ... @@ -170,8 +170,8 @@ static void dca_transfer(ir_node *irn) * don't fit into the smaller mode. */ * don't fit into the smaller mode. */ if (get_tarval_highest_bit(care) >= (int)pred_bits) if (get_tarval_highest_bit(care) >= (int)pred_bits) care = tarval_or(care, care = tarval_or(care, tarval_shl_unsigned(get_mode_one(mode), tarval_shl_unsigned(get_mode_one(mode), pred_bits - 1)); pred_bits - 1)); } else { } else { /* Thwart sign extension as it doesn't make sense on /* Thwart sign extension as it doesn't make sense on * our abstract tarvals. */ * our abstract tarvals. */ ... @@ -401,7 +401,7 @@ static void dca_init_node(ir_node *n, void *data) ... @@ -401,7 +401,7 @@ static void dca_init_node(ir_node *n, void *data) ir_mode *m = get_irn_mode(n); ir_mode *m = get_irn_mode(n); set_irn_link(n, (void *) (mode_is_int(m) ? set_irn_link(n, (void *) (mode_is_int(m) ? get_mode_null(m) : tarval_b_false)); get_mode_null(m) : tarval_b_false)); } } void dca_analyze(ir_graph *irg) void dca_analyze(ir_graph *irg) ... @@ -413,7 +413,7 @@ void dca_analyze(ir_graph *irg) ... @@ -413,7 +413,7 @@ void dca_analyze(ir_graph *irg) assert(tarval_get_wrap_on_overflow()); assert(tarval_get_wrap_on_overflow()); assert(((ir_resources_reserved(irg) & IR_RESOURCE_IRN_LINK) != 0) && assert(((ir_resources_reserved(irg) & IR_RESOURCE_IRN_LINK) != 0) && "user of dc analysis must reserve links"); "user of dc analysis must reserve links"); irg_walk_graph(irg, dca_init_node, NULL, 0); irg_walk_graph(irg, dca_init_node, NULL, 0); ... ...
 ... @@ -290,7 +290,7 @@ static void handle_if(ir_node *block, ir_node *cmp, ir_relation rel, env_t *env) ... @@ -290,7 +290,7 @@ static void handle_if(ir_node *block, ir_node *cmp, ir_relation rel, env_t *env) env->num_eq += 1; env->num_eq += 1; } else if (block_dominates(blk, cond_block) } else if (block_dominates(blk, cond_block) && is_Const(right) && !get_irn_pinned(user)) { && is_Const(right) && !get_irn_pinned(user)) { /* /* * left == Const and we found a movable user of left in a * left == Const and we found a movable user of left in a * dominator of the Cond block * dominator of the Cond block ... ...
 ... @@ -227,14 +227,12 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) ... @@ -227,14 +227,12 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) vrp_left = vrp_get_or_set_info(info, get_Eor_left(node)); vrp_left = vrp_get_or_set_info(info, get_Eor_left(node)); vrp_right = vrp_get_or_set_info(info, get_Eor_right(node)); vrp_right = vrp_get_or_set_info(info, get_Eor_right(node)); new_bits_set = tarval_or( new_bits_set = tarval_or(tarval_and(vrp_left->bits_set, tarval_not(vrp_right->bits_not_set)), tarval_and(vrp_left->bits_set, tarval_not(vrp_right->bits_not_set)), tarval_and(tarval_not(vrp_left->bits_not_set), vrp_right->bits_set)); tarval_and(tarval_not(vrp_left->bits_not_set), vrp_right->bits_set)); new_bits_not_set = tarval_not(tarval_or( new_bits_not_set = tarval_not(tarval_or(tarval_and(vrp_left->bits_set,vrp_right->bits_set), tarval_and(vrp_left->bits_set,vrp_right->bits_set), tarval_and(tarval_not(vrp_left->bits_not_set), tarval_and(tarval_not(vrp_left->bits_not_set), tarval_not(vrp_right->bits_not_set)))); tarval_not(vrp_right->bits_not_set)))); break; break; } } ... @@ -272,8 +270,8 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) ... @@ -272,8 +270,8 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) /* The second and is needed if target type is smaller*/ /* The second and is needed if target type is smaller*/ new_bits_not_set = tarval_convert_to(get_mode_all_one(old_mode), new_mode); new_bits_not_set = tarval_convert_to(get_mode_all_one(old_mode), new_mode); new_bits_not_set = tarval_and(new_bits_not_set, tarval_convert_to(vrp_pred->bits_not_set, new_mode)); new_bits_not_set = tarval_and(new_bits_not_set, tarval_convert_to(vrp_pred->bits_not_set, new_mode)); new_bits_set = tarval_and( new_bits_set = tarval_and(new_bits_not_set, new_bits_not_set, tarval_convert_to(vrp_pred->bits_set, new_mode)); tarval_convert_to(vrp_pred->bits_set, new_mode)); /* Matze: TODO, BUGGY, tarval_cmp never returns ir_relation_less_equal */ /* Matze: TODO, BUGGY, tarval_cmp never returns ir_relation_less_equal */ if (tarval_cmp(vrp_pred->range_top, get_mode_max(new_mode)) == ir_relation_less_equal) { if (tarval_cmp(vrp_pred->range_top, get_mode_max(new_mode)) == ir_relation_less_equal) { ... @@ -322,8 +320,7 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) ... @@ -322,8 +320,7 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) for (int i = 1, num = get_Phi_n_preds(node); i < num; i++) { for (int i = 1, num = get_Phi_n_preds(node); i < num; i++) { pred = get_Phi_pred(node, i); pred = get_Phi_pred(node, i); vrp_pred = vrp_get_or_set_info(info, pred); vrp_pred = vrp_get_or_set_info(info, pred); if (new_range_type == VRP_RANGE && vrp_pred->range_type == if (new_range_type == VRP_RANGE && vrp_pred->range_type == VRP_RANGE) { VRP_RANGE) { ir_relation relation = tarval_cmp(new_range_top, vrp_pred->range_top); ir_relation relation = tarval_cmp(new_range_top, vrp_pred->range_top); if (relation == ir_relation_less) { if (relation == ir_relation_less) { new_range_top = vrp_pred->range_top; new_range_top = vrp_pred->range_top; ... @@ -337,7 +334,7 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) ... @@ -337,7 +334,7 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) } } new_bits_set = tarval_and(new_bits_set, vrp_pred->bits_set); new_bits_set = tarval_and(new_bits_set, vrp_pred->bits_set); new_bits_not_set = tarval_or(new_bits_not_set, new_bits_not_set = tarval_or(new_bits_not_set, vrp_pred->bits_not_set); vrp_pred->bits_not_set); } } break; break; ... @@ -397,7 +394,7 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) ... @@ -397,7 +394,7 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) } } if (vrp->range_type == VRP_UNDEFINED && if (vrp->range_type == VRP_UNDEFINED && new_range_type != VRP_UNDEFINED) { new_range_type != VRP_UNDEFINED) { something_changed = true; something_changed = true; vrp->range_type = new_range_type; vrp->range_type = new_range_type; vrp->range_bottom = new_range_bottom; vrp->range_bottom = new_range_bottom; ... @@ -419,12 +416,12 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) ... @@ -419,12 +416,12 @@ static int vrp_update_node(ir_vrp_info *info, ir_node *node) /* if they are overlapping, cut the range.*/ /* if they are overlapping, cut the range.*/ /* TODO: Maybe we can preserve more information here*/ /* TODO: Maybe we can preserve more information here*/ if (tarval_cmp(vrp->range_bottom, new_range_top) == ir_relation_greater && if (tarval_cmp(vrp->range_bottom, new_range_top) == ir_relation_greater && tarval_cmp(vrp->range_bottom, new_range_bottom) == ir_relation_greater) { tarval_cmp(vrp->range_bottom, new_range_bottom) == ir_relation_greater) { something_changed = true; something_changed = true; vrp->range_bottom = new_range_top; vrp->range_bottom = new_range_top; } else if (tarval_cmp(vrp->range_top, new_range_bottom) == ir_relation_greater && } else if (tarval_cmp(vrp->range_top, new_range_bottom) == ir_relation_greater && tarval_cmp(vrp->range_top, new_range_top) == ir_relation_less) { tarval_cmp(vrp->range_top, new_range_top) == ir_relation_less) { something_changed = true; something_changed = true; vrp->range_top = new_range_bottom; vrp->range_top = new_range_bottom; } } ... @@ -567,7 +564,7 @@ ir_relation vrp_cmp(const ir_node *left, const ir_node *right) ... @@ -567,7 +564,7 @@ ir_relation vrp_cmp(const ir_node *left, const ir_node *right) } } if (!tarval_is_null(tarval_and(vrp_left->bits_set, tarval_not(vrp_right->bits_not_set))) || if (!tarval_is_null(tarval_and(vrp_left->bits_set, tarval_not(vrp_right->bits_not_set))) || !tarval_is_null(tarval_and(tarval_not(vrp_left->bits_not_set), vrp_right->bits_set))) { !tarval_is_null(tarval_and(tarval_not(vrp_left->bits_not_set), vrp_right->bits_set))) { return ir_relation_less_greater; return ir_relation_less_greater; } } ... ...
 ... @@ -450,7 +450,7 @@ static void introduce_epilogue(ir_node *ret, bool omit_fp) ... @@ -450,7 +450,7 @@ static void introduce_epilogue(ir_node *ret, bool omit_fp) ir_type *frame_type = get_irg_frame_type(irg); ir_type *frame_type = get_irg_frame_type(irg); unsigned frame_size = get_type_size(frame_type); unsigned frame_size = get_type_size(frame_type); ir_node *incsp = amd64_new_IncSP(block, curr_sp, -(int)frame_size, ir_node *incsp = amd64_new_IncSP(block, curr_sp, -(int)frame_size, true); true); sched_add_before(ret, incsp); sched_add_before(ret, incsp); curr_sp = incsp; curr_sp = incsp; } } ... @@ -496,7 +496,7 @@ static void introduce_prologue(ir_graph *const irg, bool omit_fp) ... @@ -496,7 +496,7 @@ static void introduce_prologue(ir_graph *const irg, bool omit_fp) be_keep_if_unused(incsp); be_keep_if_unused(incsp); } else { } else { ir_node *const incsp = amd64_new_IncSP(block, initial_sp, ir_node *const incsp = amd64_new_IncSP(block, initial_sp, frame_size, false); frame_size, false); sched_add_after(start, incsp); sched_add_after(start, incsp); edges_reroute_except(initial_sp, incsp, incsp); edges_reroute_except(initial_sp, incsp, incsp); } } ... @@ -654,7 +654,7 @@ static void amd64_generate_code(FILE *output, const char *cup_name) ... @@ -654,7 +654,7 @@ static void amd64_generate_code(FILE *output, const char *cup_name) be_timer_push(T_RA_PREPARATION); be_timer_push(T_RA_PREPARATION); be_sched_fix_flags(irg, &amd64_reg_classes[CLASS_amd64_flags], NULL, be_sched_fix_flags(irg, &amd64_reg_classes[CLASS_amd64_flags], NULL, NULL, NULL); NULL, NULL); be_timer_pop(T_RA_PREPARATION); be_timer_pop(T_RA_PREPARATION); be_step_regalloc(irg, &amd64_regalloc_if); be_step_regalloc(irg, &amd64_regalloc_if); ... ...