remove lots of unnecessary and dangerous current_ir_graph usages

[libfirm] / ir / be / bespillslots.c

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index 359dc7d..5012b14 100644 (file)
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -53,27 +53,27 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-typedef struct _spill_t {
+typedef struct spill_t {
        ir_node       *spill;
        const ir_mode *mode;      /**< mode of the spilled value */
        int            alignment; /**< alignment for the spilled value */
        int            spillslot; /**< index into spillslot_unionfind structure */
 } spill_t;
 
-typedef struct _affinity_edge_t {
+typedef struct affinity_edge_t {
        double affinity;
        int    slot1;
        int    slot2;
 } affinity_edge_t;
 
-struct _be_fec_env_t {
-       struct obstack    obst;
-       const arch_env_t *arch_env;
-       ir_graph         *irg;
-       set              *spills;
-       ir_node         **reloads;
-       affinity_edge_t **affinity_edges;
-       set              *memperms;
+struct be_fec_env_t {
+       struct obstack         obst;
+       ir_graph              *irg;
+       set                   *spills;
+       ir_node              **reloads;
+       affinity_edge_t      **affinity_edges;
+       set                   *memperms;
+       set_frame_entity_func  set_frame_entity;
 };
 
 /** Compare 2 affinity edges (used in quicksort) */
@@ -471,21 +471,21 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 
 
 
-typedef struct _spill_slot_t {
+typedef struct spill_slot_t {
        int size;
        int align;
        ir_entity *entity;
 } spill_slot_t;
 
-typedef struct _memperm_entry_t {
+typedef struct memperm_entry_t {
        ir_node* node;
        int pos;
        ir_entity *in;
        ir_entity *out;
-       struct _memperm_entry_t *next;
+       struct memperm_entry_t *next;
 } memperm_entry_t;
 
-typedef struct _memperm_t {
+typedef struct memperm_t {
        ir_node *block;
        int entrycount;
        memperm_entry_t *entries;
@@ -556,8 +556,8 @@ static void enlarge_spillslot(spill_slot_t *slot, int otheralign, int othersize)
        }
 }
 
-
-static void assign_spill_entity(ir_node *node, ir_entity *entity)
+static void assign_spill_entity(be_fec_env_t *env,
+                                ir_node *node, ir_entity *entity)
 {
        if (is_NoMem(node))
                return;
@@ -569,7 +569,7 @@ static void assign_spill_entity(ir_node *node, ir_entity *entity)
                        ir_node *in = get_irn_n(node, i);
                        assert(!is_Phi(in));
 
-                       assign_spill_entity(in, entity);
+                       assign_spill_entity(env, in, entity);
                }
                return;
        }
@@ -578,7 +578,7 @@ static void assign_spill_entity(ir_node *node, ir_entity *entity)
           instance */
        node = skip_Proj(node);
        assert(arch_get_frame_entity(node) == NULL);
-       arch_set_frame_entity(node, entity);
+       env->set_frame_entity(node, entity);
 }
 
 /**
@@ -660,7 +660,7 @@ static void assign_spillslots(be_fec_env_t *env)
                                }
                        }
                } else {
-                       assign_spill_entity(node, slot->entity);
+                       assign_spill_entity(env, node, slot->entity);
                }
        }
 
@@ -672,7 +672,7 @@ static void assign_spillslots(be_fec_env_t *env)
 
                assert(slot->entity != NULL);
 
-               arch_set_frame_entity(reload, slot->entity);
+               env->set_frame_entity(reload, slot->entity);
        }
 }
 
@@ -701,7 +701,6 @@ static ir_node *get_end_of_block_insertion_point(ir_node* block)
 
 static void create_memperms(be_fec_env_t *env)
 {
-       const arch_env_t *arch_env = env->arch_env;
        ir_graph         *irg      = env->irg;
        memperm_t        *memperm;
 
@@ -719,8 +718,8 @@ static void create_memperms(be_fec_env_t *env)
                        nodes[i] = arg;
                }
 
-               mempermnode = be_new_MemPerm(arch_env, memperm->block,
-                                            memperm->entrycount, nodes);
+               mempermnode = be_new_MemPerm(memperm->block, memperm->entrycount,
+                                            nodes);
 
                /* insert node into schedule */
                blockend = get_end_of_block_insertion_point(memperm->block);
@@ -764,13 +763,11 @@ static int count_spillslots(const be_fec_env_t *env)
 
 be_fec_env_t *be_new_frame_entity_coalescer(ir_graph *irg)
 {
-       const arch_env_t *arch_env = be_get_irg_arch_env(irg);
-       be_fec_env_t     *env      = XMALLOC(be_fec_env_t);
+       be_fec_env_t *env = XMALLOCZ(be_fec_env_t);
 
        be_liveness_assure_chk(be_assure_liveness(irg));
 
        obstack_init(&env->obst);
-       env->arch_env       = arch_env;
        env->irg            = irg;
        env->spills         = new_set(cmp_spill, 10);
        env->reloads        = NEW_ARR_F(ir_node*, 0);
@@ -791,8 +788,11 @@ void be_free_frame_entity_coalescer(be_fec_env_t *env)
        free(env);
 }
 
-void be_assign_entities(be_fec_env_t *env)
+void be_assign_entities(be_fec_env_t *env,
+                        set_frame_entity_func set_frame_entity)
 {
+       env->set_frame_entity = set_frame_entity;
+
        stat_ev_dbl("spillslots", set_count(env->spills));
 
        if (be_coalesce_spill_slots) {
@@ -812,17 +812,21 @@ void be_assign_entities(be_fec_env_t *env)
  */
 static void collect_spills_walker(ir_node *node, void *data)
 {
-       be_fec_env_t *env = data;
-       const ir_mode *mode;
+       be_fec_env_t                *env = data;
+       const ir_mode               *mode;
        const arch_register_class_t *cls;
-       int align;
+       int                          align;
+       ir_graph                    *irg;
+       const arch_env_t            *arch_env;
 
        if (! (arch_irn_classify(node) & arch_irn_class_reload))
                return;
 
-       mode  = get_irn_mode(node);
-       cls   = arch_get_irn_reg_class_out(node);
-       align = arch_env_get_reg_class_alignment(env->arch_env, cls);
+       mode     = get_irn_mode(node);
+       cls      = arch_get_irn_reg_class_out(node);
+       irg      = get_irn_irg(node);
+       arch_env = be_get_irg_arch_env(irg);
+       align    = arch_env_get_reg_class_alignment(arch_env, cls);
 
        be_node_needs_frame_entity(env, node, mode, align);
 }
@@ -834,7 +838,7 @@ void be_coalesce_spillslots(ir_graph *irg)
        /* collect reloads */
        irg_walk_graph(irg, NULL, collect_spills_walker, env);
 
-       be_assign_entities(env);
+       be_assign_entities(env, be_node_set_frame_entity);
 
        be_free_frame_entity_coalescer(env);
 }