From: Christian Würdig Date: Thu, 30 Mar 2006 13:44:13 +0000 (+0000) Subject: fixed indents X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=0ed1fdbf0e67a2d4276b1c825ce6a659c6d6d71a;p=libfirm fixed indents switched to trivial selector --- diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c index e6d30c40a..c6ba84230 100644 --- a/ir/be/ia32/bearch_ia32.c +++ b/ir/be/ia32/bearch_ia32.c @@ -243,7 +243,7 @@ static void ia32_set_stack_bias(const void *self, ir_node *irn, int bias) { char buf[64]; const ia32_irn_ops_t *ops = self; - if (is_ia32_use_frame(irn) && bias != 0) { + if (get_ia32_frame_ent(irn) && bias != 0) { ia32_am_flavour_t am_flav = get_ia32_am_flavour(irn); DBG((ops->cg->mod, LEVEL_1, "stack biased %+F with %d\n", irn, bias)); @@ -1028,7 +1028,8 @@ list_sched_selector_t ia32_sched_selector; * Returns the reg_pressure scheduler with to_appear_in_schedule() overloaded */ static const list_sched_selector_t *ia32_get_list_sched_selector(const void *self) { - memcpy(&ia32_sched_selector, reg_pressure_selector, sizeof(list_sched_selector_t)); +// memcpy(&ia32_sched_selector, reg_pressure_selector, sizeof(list_sched_selector_t)); + memcpy(&ia32_sched_selector, trivial_selector, sizeof(list_sched_selector_t)); ia32_sched_selector.to_appear_in_schedule = ia32_to_appear_in_schedule; return &ia32_sched_selector; } diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c index 39e6f9de6..949e8388e 100644 --- a/ir/be/ia32/ia32_emitter.c +++ b/ir/be/ia32/ia32_emitter.c @@ -1198,9 +1198,10 @@ static void emit_ia32_Conv_FP2FP(const ir_node *irn, ia32_emit_env_t *emit_env) * Emits code for an Int conversion. */ static void emit_ia32_Conv_I2I(const ir_node *irn, ia32_emit_env_t *emit_env) { - FILE *F = emit_env->out; - const lc_arg_env_t *env = ia32_get_arg_env(); - char *move_cmd, *conv_cmd; + FILE *F = emit_env->out; + const lc_arg_env_t *env = ia32_get_arg_env(); + char *move_cmd = "movzx"; + char *conv_cmd = NULL; ir_mode *src_mode, *tgt_mode; int n, m; char cmd_buf[SNPRINTF_BUF_LEN], cmnt_buf[SNPRINTF_BUF_LEN]; @@ -1221,10 +1222,6 @@ static void emit_ia32_Conv_I2I(const ir_node *irn, ia32_emit_env_t *emit_env) { else assert(0 && "unsupported Conv_I2I"); } - else { - move_cmd = "movzx"; - conv_cmd = NULL; - } switch(get_ia32_op_type(irn)) { case ia32_Normal: diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c index e158fa8ec..8f504d70f 100644 --- a/ir/be/ia32/ia32_new_nodes.c +++ b/ir/be/ia32/ia32_new_nodes.c @@ -445,8 +445,8 @@ ia32_am_type_t get_ia32_am_support(const ir_node *node) { * Sets the supported addrmode of an ia32 node */ void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp) { - ia32_attr_t *attr = get_ia32_attr(node); - attr->data.am_support = am_tp; + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.am_support = am_tp; } /** @@ -461,8 +461,8 @@ ia32_am_flavour_t get_ia32_am_flavour(const ir_node *node) { * Sets the addrmode flavour of an ia32 node */ void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) { - ia32_attr_t *attr = get_ia32_attr(node); - attr->data.am_flavour = am_flavour; + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.am_flavour = am_flavour; } /** @@ -1196,7 +1196,7 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi /* default compare operation to compare immediate ops */ int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) { if (a->data.tp == b->data.tp) { - return a->cnst == b->cnst; + return a->cnst != b->cnst; } return 1; diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c index d59019a70..2472cf9c7 100644 --- a/ir/be/ia32/ia32_x87.c +++ b/ir/be/ia32/ia32_x87.c @@ -1064,8 +1064,10 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg, const arch_env sim->blk_states = pmap_create(); sim->env = env; - FIRM_DBG_REGISTER(dbg, "firm.be.ia32.x87"); + FIRM_DBG_REGISTER(dbg, "firm.be.ia32.x87"); +#ifndef DEBUG_libfirm firm_dbg_set_mask(dbg, SET_LEVEL_2); +#endif /* DEBUG_libfirm */ DB((dbg, LEVEL_1, "--------------------------------\n" "x87 Simulator started for %+F\n", irg)); @@ -1122,10 +1124,10 @@ void x87_simulate_graph(const arch_env_t *env, ir_graph *irg, ir_node **blk_list x87_simulator sim; int i; - /* we need liveness info for the current graph */ + /* we need liveness info for the current graph */ be_liveness(irg); - /* create the simulator */ + /* create the simulator */ x87_init_simulator(&sim, irg, env); start_block = get_irg_start_block(irg); @@ -1149,6 +1151,6 @@ void x87_simulate_graph(const arch_env_t *env, ir_graph *irg, ir_node **blk_list } } while (! pdeq_empty(worklist)); - /* kill it */ + /* kill it */ x87_destroy_simulator(&sim); }