Fixed opt/fehler192.c.

[libfirm] / ir / be / beabi.c

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index 607cdb7..97b7cec 100644 (file)
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -362,6 +362,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        int                    *reg_param_idxs;
        int                    *stack_param_idx;
        int                     i, n, destroy_all_regs;
+       int                     throws_exception;
        size_t                  s;
        size_t                  p;
        dbg_info               *dbgi;
@@ -535,7 +536,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                                 * checking */
                                continue;
                        }
-                       if (destroy_all_regs || (reg->type & arch_register_type_caller_save)) {
+                       if (destroy_all_regs || arch_register_is_caller_save(arch_env, reg)) {
                                if (!(reg->type & arch_register_type_ignore)) {
                                        ARR_APP1(const arch_register_t*, destroyed_regs, reg);
                                }
@@ -591,6 +592,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        assert(n_ins == (int) (n_reg_params + ARR_LEN(states)));
 
        /* ins collected, build the call */
+       throws_exception = ir_throws_exception(irn);
        if (env->call->flags.bits.call_has_imm && is_SymConst(call_ptr)) {
                /* direct call */
                low_call = be_new_Call(dbgi, irg, bl, curr_mem, curr_sp, curr_sp,
@@ -603,6 +605,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                                       n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs),
                                       n_ins, in, get_Call_type(irn));
        }
+       ir_set_throws_exception(low_call, throws_exception);
        be_Call_set_pop(low_call, call->pop);
 
        /* put the call into the list of all calls for later processing */
@@ -616,9 +619,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
        /* now handle results */
        for (i = 0; i < n_res; ++i) {
-               int pn;
                ir_node           *proj = res_projs[i];
                be_abi_call_arg_t *arg  = get_call_arg(call, 1, i, 0);
+               long               pn   = i + pn_be_Call_first_res;
 
                /* returns values on stack not supported yet */
                assert(arg->in_reg);
@@ -753,7 +756,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                }
 
                if (! mem_proj) {
-                       mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M_regular);
+                       mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M);
                        keep_alive(mem_proj);
                }
        }
@@ -1271,7 +1274,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
        /* Add uses of the callee save registers. */
        foreach_pmap(env->regs, ent) {
                const arch_register_t *reg = (const arch_register_t*)ent->key;
-               if (reg->type & (arch_register_type_callee_save | arch_register_type_ignore))
+               if ((reg->type & arch_register_type_ignore) || arch_register_is_callee_save(arch_env, reg))
                        pmap_insert(reg_map, ent->key, ent->value);
        }
 
@@ -1510,6 +1513,7 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_graph *irg,
                /* the new memory Proj gets the last Proj from store */
                set_Proj_pred(nmem, store);
                set_Proj_proj(nmem, pn_Store_M);
+               set_nodes_block(nmem, get_nodes_block(store));
 
                /* move all entities to the frame type */
                frame_tp = get_irg_frame_type(irg);
@@ -1556,7 +1560,22 @@ static void fix_start_block(ir_graph *irg)
 
        assert(is_Proj(initial_X));
        exchange(initial_X, jmp);
-       set_irg_initial_exec(irg, new_r_Bad(irg));
+       set_irg_initial_exec(irg, new_r_Bad(irg, mode_X));
+
+       /* merge start block with successor if possible */
+       {
+               const ir_edge_t *edge;
+               foreach_out_edge(jmp, edge) {
+                       ir_node *succ = get_edge_src_irn(edge);
+                       if (!is_Block(succ))
+                               continue;
+
+                       if (get_irn_arity(succ) == 1) {
+                               exchange(succ, start_block);
+                       }
+                       break;
+               }
+       }
 }
 
 /**
@@ -1768,7 +1787,7 @@ static void modify_irg(ir_graph *irg)
                const arch_register_class_t *cls = &arch_env->register_classes[i];
                for (j = 0; j < cls->n_regs; ++j) {
                        const arch_register_t *reg = &cls->regs[j];
-                       if (reg->type & (arch_register_type_callee_save | arch_register_type_state)) {
+                       if ((reg->type & arch_register_type_state) || arch_register_is_callee_save(arch_env, reg)) {
                                pmap_insert(env->regs, (void *) reg, NULL);
                        }
                }
@@ -1893,7 +1912,7 @@ static void modify_irg(ir_graph *irg)
        /* the arg proj is not needed anymore now and should be only used by the anchor */
        assert(get_irn_n_edges(arg_tuple) == 1);
        kill_node(arg_tuple);
-       set_irg_args(irg, new_r_Bad(irg));
+       set_irg_args(irg, new_r_Bad(irg, mode_T));
 
        /* All Return nodes hang on the End node, so look for them there. */
        end = get_irg_end_block(irg);
@@ -2144,6 +2163,8 @@ void be_abi_introduce(ir_graph *irg)
        env->init_sp = dummy;
        env->calls   = NEW_ARR_F(ir_node*, 0);
 
+       edges_assure(irg);
+
        if (options->pic) {
                irg_walk_graph(irg, fix_pic_symconsts, NULL, env);
        }
@@ -2225,7 +2246,7 @@ void be_set_allocatable_regs(const ir_graph *irg,
        }
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi)
 void be_init_abi(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.abi");