the spillslot coalescer is now a general frame entity coalescer for all nodes that...

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index c353a8a..3d9993a 100644 (file)
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -563,7 +563,6 @@ static void assign_spillslots(be_fec_env_t *env)
                                }
                        }
                } else {
-                       assert(arch_irn_class_is(arch_env, node, spill));
                        arch_set_frame_entity(arch_env, node, slot->entity);
                }
        }

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index ac33f22..3148224 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -47,6 +47,7 @@
 #include "../beblocksched.h"
 #include "../bemachine.h"
 #include "../beilpsched.h"
+#include "../bespillslots.h"
 
 #include "bearch_ia32_t.h"
 
@@ -1271,6 +1272,30 @@ static void ia32_after_ra_walker(ir_node *block, void *env) {
        }
 }
 
+/**
+ * Collects nodes that need frame entities assigned.
+ */
+static void ia32_collect_frame_entity_nodes(ir_node *node, void *data)
+{
+       be_fec_env_t *env = data;
+
+       if (be_is_Reload(node) && be_get_frame_entity(node) == NULL) {
+               const ir_mode *mode = get_irn_mode(node);
+               int align = get_mode_size_bytes(mode);
+               be_node_needs_frame_entity(env, node, mode, align);
+       } else if(is_ia32_irn(node) && get_ia32_frame_ent(node) == NULL) {
+               if (is_ia32_Load(node)) {
+                       const ir_mode *mode = get_ia32_ls_mode(node);
+                       int align = get_mode_size_bytes(mode);
+                       be_node_needs_frame_entity(env, node, mode, align);
+               } else if (is_ia32_vfild(node)) {
+                       const ir_mode *mode = get_ia32_ls_mode(node);
+                       int align = 4;
+                       be_node_needs_frame_entity(env, node, mode, align);
+               }
+       }
+}
+
 /**
  * We transform Spill and Reload here. This needs to be done before
  * stack biasing otherwise we would miss the corrected offset for these nodes.
@@ -1278,6 +1303,12 @@ static void ia32_after_ra_walker(ir_node *block, void *env) {
 static void ia32_after_ra(void *self) {
        ia32_code_gen_t *cg = self;
        ir_graph *irg = cg->irg;
+       be_fec_env_t *fec_env = be_new_frame_entity_coalescer(cg->birg);
+
+       /* create and coalesce frame entities */
+       irg_walk_graph(irg, NULL, ia32_collect_frame_entity_nodes, fec_env);
+       be_assign_entities(fec_env);
+       be_free_frame_entity_coalescer(fec_env);
 
        irg_block_walk_graph(irg, NULL, ia32_after_ra_walker, cg);
 
@@ -1354,8 +1385,6 @@ static void *ia32_cg_init(be_irg_t *birg) {
        cg->isa       = isa;
        cg->birg      = birg;
        cg->blk_sched = NULL;
-       cg->fp_to_gp  = NULL;
-       cg->gp_to_fp  = NULL;
        cg->fp_kind   = isa->fp_kind;
        cg->used_fp   = fp_none;
        cg->dump      = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;

diff --git a/ir/be/ia32/bearch_ia32_t.h b/ir/be/ia32/bearch_ia32_t.h
index aa6832a..bfeeb28 100644 (file)
--- a/ir/be/ia32/bearch_ia32_t.h
+++ b/ir/be/ia32/bearch_ia32_t.h
@@ -99,8 +99,6 @@ typedef struct _ia32_code_gen_t {
        be_irg_t                       *birg;          /**< The be-irg (contains additional information about the irg) */
        ir_node                        **blk_sched;    /**< an array containing the scheduled blocks */
        ia32_optimize_t                opt;            /**< contains optimization information */
-       ir_entity                      *fp_to_gp;      /**< allocated entity for fp to gp conversion */
-       ir_entity                      *gp_to_fp;      /**< allocated entity for gp to fp conversion */
        nodeset                        *kill_conv;     /**< Remember all convs to be killed */
        int                            arch;           /**< instruction architecture */
        int                            opt_arch;       /**< optimize for architecture */

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index cc0e8df..0df2872 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -610,6 +610,9 @@ const char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
        static struct obstack *obst  = NULL;
        ir_mode *mode = get_ia32_ls_mode(n);
 
+       /* just to be sure... */
+       assert(!is_ia32_use_frame(n) || get_ia32_frame_ent(n) != NULL);
+
        if (! is_ia32_Lea(n))
                assert(mode && "AM node must have ls_mode attribute set.");
 

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 2f70ad2..87e98a2 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -884,7 +884,10 @@ ir_entity *get_ia32_frame_ent(const ir_node *node) {
 void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
        ia32_attr_t *attr = get_ia32_attr(node);
        attr->frame_ent   = ent;
-       set_ia32_use_frame(node);
+       if(ent != NULL)
+               set_ia32_use_frame(node);
+       else
+               clear_ia32_use_frame(node);
 }
 
 

diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c
index 8781ed9..0b3cfc6 100644 (file)
--- a/ir/be/ia32/ia32_optimize.c
+++ b/ir/be/ia32/ia32_optimize.c
@@ -1296,13 +1296,14 @@ static ir_node *fold_addr(ia32_code_gen_t *cg, ir_node *irn, ir_node *noreg) {
 
                /* copy the frame entity (could be set in case of Add */
                /* which was a FrameAddr) */
-               if (lea_ent)
+               if (lea_ent != NULL) {
                        set_ia32_frame_ent(res, lea_ent);
-               else
-                       set_ia32_frame_ent(res, get_ia32_frame_ent(irn));
-
-               if (get_ia32_frame_ent(res))
                        set_ia32_use_frame(res);
+               } else {
+                       set_ia32_frame_ent(res, get_ia32_frame_ent(irn));
+                       if(is_ia32_use_frame(irn))
+                               set_ia32_use_frame(res);
+               }
 
                /* set scale */
                set_ia32_am_scale(res, scale);
@@ -1390,9 +1391,9 @@ static void merge_loadstore_lea(ir_node *irn, ir_node *lea) {
        ir_entity *lea_ent = get_ia32_frame_ent(lea);
 
        /* If the irn and the LEA both have a different frame entity set: do not merge */
-       if (irn_ent && lea_ent && (irn_ent != lea_ent))
+       if (irn_ent != NULL && lea_ent != NULL && (irn_ent != lea_ent))
                return;
-       else if (! irn_ent && lea_ent) {
+       else if (irn_ent == NULL && lea_ent != NULL) {
                set_ia32_frame_ent(irn, lea_ent);
                set_ia32_use_frame(irn);
        }
@@ -1652,6 +1653,8 @@ static void optimize_am(ir_node *irn, void *env) {
                set_ia32_am_flavour(irn, get_ia32_am_flavour(load));
                set_ia32_op_type(irn, ia32_AddrModeD);
                set_ia32_frame_ent(irn, get_ia32_frame_ent(load));
+               if(is_ia32_use_frame(load))
+                       set_ia32_use_frame(irn);
                set_ia32_ls_mode(irn, get_ia32_ls_mode(load));
 
                set_ia32_am_sc(irn, get_ia32_am_sc(load));

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index b2f7c95..984862d 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -1951,7 +1951,6 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) {
  */
 static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_mode *tgt_mode) {
        ia32_code_gen_t *cg    = env->cg;
-       ir_entity       *ent   = cg->fp_to_gp;
        ir_graph        *irg   = env->irg;
        ir_node         *irn   = env->irn;
        ir_node         *block = env->block;
@@ -1959,21 +1958,9 @@ static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_mode *tgt_mode) {
        ir_node         *op    = get_Conv_op(env->irn);
        ir_node         *fist, *mem, *load;
 
-#if 0
-       if (! ent) {
-               int size = get_mode_size_bytes(ia32_reg_classes[CLASS_ia32_vfp].mode);
-               ent = cg->fp_to_gp =
-                       frame_alloc_area(get_irg_frame_type(env->irg), size, 16, 0);
-               if(ent == NULL) {
-                       panic("Couldn't allocate space on stack for fp conversion");
-               }
-       }
-#endif
-
        /* do a fist */
        fist = new_rd_ia32_vfist(env->dbg, irg, block, get_irg_frame(irg), noreg, op, get_irg_no_mem(irg));
 
-       set_ia32_frame_ent(fist, ent);
        set_ia32_use_frame(fist);
        set_ia32_am_support(fist, ia32_am_Dest);
        set_ia32_op_type(fist, ia32_AddrModeD);
@@ -1986,7 +1973,6 @@ static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_mode *tgt_mode) {
        /* do a Load */
        load = new_rd_ia32_Load(env->dbg, irg, block, get_irg_frame(irg), noreg, mem);
 
-       set_ia32_frame_ent(load, ent);
        set_ia32_use_frame(load);
        set_ia32_am_support(load, ia32_am_Source);
        set_ia32_op_type(load, ia32_AddrModeS);
@@ -2002,7 +1988,6 @@ static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_mode *tgt_mode) {
  */
 static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_mode *src_mode) {
        ia32_code_gen_t *cg = env->cg;
-       ir_entity *ent = cg->gp_to_fp;
        ir_node   *irn = env->irn;
        ir_graph  *irg = env->irg;
        ir_node   *block = env->block;
@@ -2012,15 +1997,6 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_mode *src_mode) {
        ir_node   *fild, *store;
        int       src_bits;
 
-       if (ent == NULL) {
-               int size = get_mode_size_bytes(ia32_reg_classes[CLASS_ia32_gp].mode);
-               ent = cg->gp_to_fp =
-                       frame_alloc_area(get_irg_frame_type(env->irg), size, size, 0);
-               if(ent == NULL) {
-                       panic("Couldn't allocate space on stack for fp conversion");
-               }
-       }
-
        /* first convert to 32 bit */
        src_bits = get_mode_size_bits(src_mode);
        if (src_bits == 8) {
@@ -2037,7 +2013,6 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_mode *src_mode) {
        /* do a store */
        store = new_rd_ia32_Store(env->dbg, irg, block, get_irg_frame(irg), noreg, op, nomem);
 
-       set_ia32_frame_ent(store, ent);
        set_ia32_use_frame(store);
        set_ia32_am_support(store, ia32_am_Dest);
        set_ia32_op_type(store, ia32_AddrModeD);
@@ -2047,7 +2022,6 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_mode *src_mode) {
        /* do a fild */
        fild = new_rd_ia32_vfild(env->dbg, irg, block, get_irg_frame(irg), noreg, store);
 
-       set_ia32_frame_ent(fild, ent);
        set_ia32_use_frame(fild);
        set_ia32_am_support(fild, ia32_am_Source);
        set_ia32_op_type(fild, ia32_AddrModeS);