renamed phase_t to ir_phase

[r12663]

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index 3034d56..2c279f0 100644 (file)
--- a/ir/be/becopyheur2.c
+++ b/ir/be/becopyheur2.c
@@ -102,7 +102,7 @@ typedef struct {
 } col_cost_pair_t;
 
 typedef struct {
-       phase_t     ph;
+       ir_phase     ph;
        copy_opt_t *co;
        bitset_t   *ignore_regs;
        co2_irn_t  *touched;
@@ -173,7 +173,7 @@ typedef struct {
 #define get_co2_irn(co2, irn)         ((co2_irn_t *)       phase_get_or_set_irn_data(&co2->ph, irn))
 #define get_co2_cloud_irn(co2, irn)   ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
 
-static void *co2_irn_init(phase_t *ph, ir_node *irn, void *data)
+static void *co2_irn_init(ir_phase *ph, ir_node *irn, void *data)
 {
        co2_t *env         = (co2_t *) ph;
        affinity_node_t *a = get_affinity_info(env->co, irn);

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index 2de1592..480b416 100644 (file)
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -886,7 +886,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
 }
 
 typedef struct _appel_clique_walker_t {
-       phase_t ph;
+       ir_phase ph;
        const copy_opt_t *co;
        int curr_nr;
        int node_count;
@@ -924,7 +924,7 @@ static int appel_aff_weight(const appel_clique_walker_t *env, ir_node *bl)
 #endif
 }
 
-static void *appel_clique_walker_irn_init(phase_t *phase, ir_node *irn, void *old)
+static void *appel_clique_walker_irn_init(ir_phase *phase, ir_node *irn, void *old)
 {
        appel_block_info_t *res = NULL;
 

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 821809e..1e80f11 100644 (file)
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -25,7 +25,6 @@
 #include "irbitset.h"
 #include "beifg_t.h"
 #include "beifg_impl.h"
-#include "irphase.h"
 #include "irphase_t.h"
 #include "bechordal.h"
 #include "error.h"
@@ -42,7 +41,7 @@
 typedef struct _coloring_t coloring_t;
 
 struct _coloring_t {
-       phase_t ph;
+       ir_phase ph;
        const arch_env_t *arch_env;
        ir_graph *irg;
 };
@@ -62,7 +61,7 @@ size_t (be_ifg_cliques_iter_size)(const be_ifg_t *ifg)
        return ifg->impl->cliques_iter_size;
 }
 
-static void *regs_irn_data_init(phase_t *ph, ir_node *irn, void *data)
+static void *regs_irn_data_init(ir_phase *ph, ir_node *irn, void *data)
 {
        coloring_t *coloring = (coloring_t *) ph;
        return (void *) arch_get_irn_register(coloring->arch_env, irn);

diff --git a/ir/be/beifg_pointer.c b/ir/be/beifg_pointer.c
index fa9a1c2..5c99d74 100644 (file)
--- a/ir/be/beifg_pointer.c
+++ b/ir/be/beifg_pointer.c
@@ -15,7 +15,6 @@
 
 #include "belive_t.h"
 #include "list.h"
-#include "irphase.h"
 #include "irphase_t.h"
 
 #include "irnode_t.h"
@@ -49,7 +48,7 @@ typedef struct _ptr_head_t {
 typedef struct _ifg_pointer_t {
        const be_ifg_impl_t *impl;
        const be_chordal_env_t *env;
-       phase_t ph;
+       ir_phase ph;
        struct obstack obst;
        ptr_head_t *curr_ptr_head;
        ptr_element_t *curr_element;
@@ -70,7 +69,7 @@ typedef struct _ptr_iter_t {
 
 /* PRIVATE FUNCTIONS */
 
-static void *ptr_irn_data_init(phase_t *ph, ir_node *irn, void *data)
+static void *ptr_irn_data_init(ir_phase *ph, ir_node *irn, void *data)
 {
        ptr_head_t *head = phase_alloc(ph, sizeof(*head));
        INIT_LIST_HEAD(&head->list);

diff --git a/ir/be/belive.c b/ir/be/belive.c
index 8c6c3d0..817cd63 100644 (file)
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -440,7 +440,7 @@ static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
        }
 }
 
-static void *lv_phase_data_init(phase_t *phase, ir_node *irn, void *old)
+static void *lv_phase_data_init(ir_phase *phase, ir_node *irn, void *old)
 {
        struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
        memset(info, 0, LV_STD_SIZE * sizeof(info[0]));

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 6f1e965..b23a3ee 100644 (file)
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -21,7 +21,7 @@
 #include "belive.h"
 
 struct _be_lv_t {
-       phase_t ph;
+       ir_phase ph;
        ir_graph *irg;
        bitset_t *nodes;
        hook_entry_t hook_info;

diff --git a/ir/be/beschedmris.c b/ir/be/beschedmris.c
index 54463c0..d0b1add 100644 (file)
--- a/ir/be/beschedmris.c
+++ b/ir/be/beschedmris.c
@@ -33,7 +33,7 @@
 #include "benodesets.h"
 
 struct _mris_env_t {
-       phase_t            ph;
+       ir_phase            ph;
        heights_t         *heights;
        const arch_env_t  *aenv;
        ir_graph          *irg;
@@ -57,7 +57,7 @@ typedef struct _mris_irn_t {
 #define get_mris_irn(env, irn)   ((mris_irn_t *) phase_get_or_set_irn_data(&env->ph, irn))
 #define foreach_lineage(env, pos, tmp) list_for_each_entry_safe(mris_irn_t, pos, tmp, &(env)->lineage_head, lineage_list)
 
-static void *mris_irn_data_init(phase_t *ph, ir_node *irn, void *data)
+static void *mris_irn_data_init(ir_phase *ph, ir_node *irn, void *data)
 {
        mris_irn_t *mi = data ? data : phase_alloc(ph, sizeof(mi[0]));
        memset(mi, 0, sizeof(mi[0]));

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 350a7df..61d84a6 100644 (file)
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -124,7 +124,7 @@ typedef struct _serialization {
 } serialization_t;
 
 typedef struct _rss {
-       phase_t          ph;              /**< Phase to hold some data */
+       ir_phase          ph;              /**< Phase to hold some data */
        heights_t        *h;              /**< The current height object */
        ir_graph         *irg;            /**< The irg to preprocess */
        plist_t          *nodes;          /**< The list of interesting nodes */
@@ -558,7 +558,7 @@ static void debug_vcg_dump_dvg_pkiller(rss_t *rss, dvg_t *dvg) {
 /**
  * In case there is no rss information for irn, initialize it.
  */
-static void *init_rss_irn(phase_t *ph, ir_node *irn, void *old) {
+static void *init_rss_irn(ir_phase *ph, ir_node *irn, void *old) {
        rss_irn_t *res = old ? old : phase_alloc(ph, sizeof(res[0]));
 
        res->descendant_list = plist_obstack_new(phase_obst(ph));