Panic when get_call_result_proj() does not find the Proj.

[libfirm] / ir / be / ia32 / bearch_ia32.c

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index d718647..765cfdb 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -724,7 +724,6 @@ ir_node *ia32_turn_back_am(ir_node *node)
 
        /* rewire mem-proj */
        if (get_irn_mode(node) == mode_T) {
-               const ir_edge_t *edge;
                foreach_out_edge(node, edge) {
                        ir_node *out = get_edge_src_irn(edge);
                        if (get_irn_mode(out) == mode_M) {
@@ -971,16 +970,14 @@ static ir_node* create_spproj(ir_node *node, ir_node *pred, int pos)
  */
 static void transform_MemPerm(ir_node *node)
 {
-       ir_node         *block = get_nodes_block(node);
-       ir_graph        *irg   = get_irn_irg(node);
-       ir_node         *sp    = be_get_initial_reg_value(irg, &ia32_registers[REG_ESP]);
-       int              arity = be_get_MemPerm_entity_arity(node);
-       ir_node        **pops  = ALLOCAN(ir_node*, arity);
-       ir_node         *in[1];
-       ir_node         *keep;
-       int              i;
-       const ir_edge_t *edge;
-       const ir_edge_t *next;
+       ir_node  *block = get_nodes_block(node);
+       ir_graph *irg   = get_irn_irg(node);
+       ir_node  *sp    = be_get_initial_reg_value(irg, &ia32_registers[REG_ESP]);
+       int       arity = be_get_MemPerm_entity_arity(node);
+       ir_node **pops  = ALLOCAN(ir_node*, arity);
+       ir_node  *in[1];
+       ir_node  *keep;
+       int       i;
 
        /* create Pushs */
        for (i = 0; i < arity; ++i) {
@@ -1041,7 +1038,7 @@ static void transform_MemPerm(ir_node *node)
        sched_add_before(node, keep);
 
        /* exchange memprojs */
-       foreach_out_edge_safe(node, edge, next) {
+       foreach_out_edge_safe(node, edge) {
                ir_node *proj = get_edge_src_irn(edge);
                int p = get_Proj_proj(proj);
 
@@ -1177,7 +1174,7 @@ static void introduce_epilog(ir_node *ret)
        ir_node               *block      = get_nodes_block(ret);
        ir_node               *first_sp   = get_irn_n(ret, n_be_Return_sp);
        ir_node               *curr_sp    = first_sp;
-       ir_mode               *mode_gp    = mode_Iu;
+       ir_mode               *mode_gp    = ia32_reg_classes[CLASS_ia32_gp].mode;
 
        if (!layout->sp_relative) {
                int      n_ebp   = determine_ebp_input(ret);
@@ -1248,7 +1245,6 @@ static void introduce_prolog_epilog(ir_graph *irg)
                ir_node *incsp;
 
                curr_sp = new_r_Proj(push, mode_gp, pn_ia32_Push_stack);
-               mem     = new_r_Proj(push, mode_M, pn_ia32_Push_M);
                arch_set_irn_register(curr_sp, sp);
                sched_add_after(start, push);
 
@@ -1679,7 +1675,6 @@ static ir_node *ia32_create_trampoline_fkt(ir_node *block, ir_node *mem, ir_node
        p   = new_r_Add(block, p, one, mode);
        st  = new_r_Store(block, mem, p, callee, cons_none);
        mem = new_r_Proj(st, mode_M, pn_Store_M);
-       p   = new_r_Add(block, p, four, mode);
 
        return mem;
 }
@@ -1734,7 +1729,7 @@ static void ia32_init(void)
        ia32_mode_E = new_float_mode("E", irma_x86_extended_float, 15, 63);
        ia32_type_E = new_type_primitive(ia32_mode_E);
        set_type_size_bytes(ia32_type_E, 12);
-       set_type_alignment_bytes(ia32_type_E, 16);
+       set_type_alignment_bytes(ia32_type_E, 4);
 
        mode_long_long = new_int_mode("long long", irma_twos_complement, 64, 1, 64);
        type_long_long = new_type_primitive(mode_long_long);
@@ -2032,6 +2027,7 @@ static int ia32_is_valid_clobber(const char *clobber)
 
 static void ia32_lower_for_target(void)
 {
+       ir_mode *mode_gp = ia32_reg_classes[CLASS_ia32_gp].mode;
        size_t i, n_irgs = get_irp_n_irgs();
 
        /* perform doubleword lowering */
@@ -2056,6 +2052,12 @@ static void ia32_lower_for_target(void)
                lower_floating_point();
        }
 
+       for (i = 0; i < n_irgs; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               /* break up switches with wide ranges */
+               lower_switch(irg, 4, 256, mode_gp);
+       }
+
        ir_prepare_dw_lowering(&lower_dw_params);
        ir_lower_dw_ops();
 
@@ -2063,8 +2065,6 @@ static void ia32_lower_for_target(void)
                ir_graph *irg = get_irp_irg(i);
                /* lower for mode_b stuff */
                ir_lower_mode_b(irg, mode_Iu);
-               /* break up switches with wide ranges */
-               lower_switch(irg, 4, 256, false);
        }
 
        for (i = 0; i < n_irgs; ++i) {