- BugFix: transmit a block, not a node (fixes r23473)

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

diff --git a/ir/be/ia32/ia32_common_transform.c b/ir/be/ia32/ia32_common_transform.c
index 5241adb..b1280d7 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.c
+++ b/ir/be/ia32/ia32_common_transform.c
@@ -24,12 +24,9 @@
  * @author      Matthias Braun, Sebastian Buchwald
  * @version     $Id: ia32_common_transform.c 21012 2008-08-06 13:35:17Z beck $
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "error.h"
-#include "irargs_t.h"
 #include "ircons.h"
 #include "irprintf.h"
 #include "typerep.h"
@@ -174,7 +171,7 @@ ir_node *create_Immediate(ir_entity *symconst, int symconst_sign, long val)
        ir_node  *start_block = get_irg_start_block(irg);
        ir_node  *immediate   = new_rd_ia32_Immediate(NULL, irg, start_block,
                                                      symconst, symconst_sign, val);
-       arch_set_irn_register(env_cg->arch_env, immediate, &ia32_gp_regs[REG_GP_NOREG]);
+       arch_set_irn_register(immediate, &ia32_gp_regs[REG_GP_NOREG]);
 
        return immediate;
 }
@@ -205,16 +202,6 @@ const arch_register_t *ia32_get_clobber_register(const char *clobber)
        return reg;
 }
 
-#ifndef NDEBUG
-const char *ia32_get_old_node_name(ia32_code_gen_t *cg, ir_node *irn) {
-       ia32_isa_t *isa = (ia32_isa_t*) cg->arch_env;
-
-       lc_eoprintf(firm_get_arg_env(), isa->name_obst, "%+F", irn);
-       obstack_1grow(isa->name_obst, 0);
-       return obstack_finish(isa->name_obst);
-}
-#endif /* NDEBUG */
-
 int ia32_mode_needs_gp_reg(ir_mode *mode) {
        if(mode == mode_fpcw)
                return 0;
@@ -484,6 +471,7 @@ ir_node *gen_ASM(ir_node *node)
 
 #ifdef FIRM_GRGEN_BE
        case TRANSFORMER_PBQP:
+       case TRANSFORMER_RAND:
                new_block = get_nodes_block(node);
                break;
 #endif
@@ -500,8 +488,7 @@ ir_node *gen_ASM(ir_node *node)
        }
 
        arity = get_irn_arity(node);
-       in    = alloca(arity * sizeof(in[0]));
-       memset(in, 0, arity * sizeof(in[0]));
+       in    = ALLOCANZ(ir_node*, arity);
 
        clobbers   = get_ASM_clobbers(node);
        n_clobbers = 0;
@@ -613,6 +600,7 @@ ir_node *gen_ASM(ir_node *node)
 
 #ifdef FIRM_GRGEN_BE
                        case TRANSFORMER_PBQP:
+                       case TRANSFORMER_RAND:
                                input = get_irn_n(node, i);
                                break;
 #endif
@@ -652,16 +640,13 @@ ir_node *gen_ASM(ir_node *node)
        new_node = new_rd_ia32_Asm(dbgi, irg, new_block, arity, in, out_arity,
                                   get_ASM_text(node), register_map);
 
-       /* Prevent the ASM node from being scheduled before the Barrier, if it has
-        * no inputs */
-       if (arity == 0 && get_irg_start_block(irg) == new_block) {
-               add_irn_dep(new_node, get_irg_frame(irg));
-       }
+       if (arity == 0)
+               be_dep_on_frame(new_node);
 
        set_ia32_out_req_all(new_node, out_reg_reqs);
        set_ia32_in_req_all(new_node, in_reg_reqs);
 
-       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
+       SET_IA32_ORIG_NODE(new_node, node);
 
        return new_node;
 }
@@ -693,6 +678,7 @@ ir_node *gen_CopyB(ir_node *node) {
 
 #ifdef FIRM_GRGEN_BE
                case TRANSFORMER_PBQP:
+               case TRANSFORMER_RAND:
                        block    = get_nodes_block(node);
                        new_src  = get_CopyB_src(node);
                        new_dst  = get_CopyB_dst(node);
@@ -710,7 +696,7 @@ ir_node *gen_CopyB(ir_node *node) {
                size >>= 2;
 
                res = new_rd_ia32_Const(dbgi, irg, block, NULL, 0, size);
-               add_irn_dep(res, get_irg_frame(irg));
+               be_dep_on_frame(res);
 
                res = new_rd_ia32_CopyB(dbgi, irg, block, new_dst, new_src, res, new_mem, rem);
        } else {
@@ -721,7 +707,7 @@ ir_node *gen_CopyB(ir_node *node) {
                res = new_rd_ia32_CopyB_i(dbgi, irg, block, new_dst, new_src, new_mem, size);
        }
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
+       SET_IA32_ORIG_NODE(res, node);
 
        return res;
 }
@@ -739,6 +725,7 @@ ir_node *gen_Proj_tls(ir_node *node) {
 
 #ifdef FIRM_GRGEN_BE
                case TRANSFORMER_PBQP:
+               case TRANSFORMER_RAND:
                        block = get_nodes_block(node);
                        break;
 #endif
@@ -765,12 +752,7 @@ ir_node *gen_Unknown(ir_node *node)
                        ir_node  *block = get_irg_start_block(irg);
                        ir_node  *ret   = new_rd_ia32_vfldz(dbgi, irg, block);
 
-                       /* Const Nodes before the initial IncSP are a bad idea, because
-                        * they could be spilled and we have no SP ready at that point yet.
-                        * So add a dependency to the initial frame pointer calculation to
-                        * avoid that situation.
-                        */
-                       add_irn_dep(ret, get_irg_frame(irg));
+                       be_dep_on_frame(ret);
                        return ret;
                }
        } else if (ia32_mode_needs_gp_reg(mode)) {
@@ -859,6 +841,45 @@ const arch_register_req_t *parse_clobber(const char *clobber)
        return req;
 }
 
+
+int prevents_AM(ir_node *const block, ir_node *const am_candidate,
+                       ir_node *const other)
+{
+       if (get_nodes_block(other) != block)
+               return 0;
+
+       if (is_Sync(other)) {
+               int i;
+
+               for (i = get_Sync_n_preds(other) - 1; i >= 0; --i) {
+                       ir_node *const pred = get_Sync_pred(other, i);
+
+                       if (get_nodes_block(pred) != block)
+                               continue;
+
+                       /* Do not block ourselves from getting eaten */
+                       if (is_Proj(pred) && get_Proj_pred(pred) == am_candidate)
+                               continue;
+
+                       if (!heights_reachable_in_block(heights, pred, am_candidate))
+                               continue;
+
+                       return 1;
+               }
+
+               return 0;
+       } else {
+               /* Do not block ourselves from getting eaten */
+               if (is_Proj(other) && get_Proj_pred(other) == am_candidate)
+                       return 0;
+
+               if (!heights_reachable_in_block(heights, other, am_candidate))
+                       return 0;
+
+               return 1;
+       }
+}
+
 ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
 {
        int          minus         = 0;