X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeschedmris.c;h=6bfbd0cf67669e646d9b089137bad9b42c54af0b;hb=0a86db8b16bcb48d0fdde8e1180f7a007ea2bf10;hp=fc567c67c3aaadf8ccbf21cf966475485e930830;hpb=00c6cd4ea2df08ab09015166f8a420d0e7792110;p=libfirm diff --git a/ir/be/beschedmris.c b/ir/be/beschedmris.c index fc567c67c..6bfbd0cf6 100644 --- a/ir/be/beschedmris.c +++ b/ir/be/beschedmris.c @@ -46,16 +46,16 @@ #include "irtools.h" #include "irbitset.h" #include "irnodeset.h" -#include "height.h" +#include "heights.h" #include "benode.h" #include "besched.h" #include "beschedmris.h" #include "beirg.h" -struct _mris_env_t { +struct mris_env_t { ir_phase ph; - heights_t *heights; + ir_heights_t *heights; ir_graph *irg; ir_node *bl; int visited; @@ -64,7 +64,7 @@ struct _mris_env_t { DEBUG_ONLY(firm_dbg_module_t *dbg;) }; -typedef struct _mris_irn_t { +typedef struct mris_irn_t { int visited; ir_node *lineage_start; ir_node *lineage_next; @@ -79,7 +79,7 @@ typedef struct _mris_irn_t { static void *mris_irn_data_init(ir_phase *ph, const ir_node *irn) { - mris_irn_t *mi = phase_alloc(ph, sizeof(mi[0])); + mris_irn_t *mi = (mris_irn_t*)phase_alloc(ph, sizeof(mi[0])); (void) irn; memset(mi, 0, sizeof(mi[0])); INIT_LIST_HEAD(&mi->lineage_list); @@ -132,7 +132,7 @@ static ir_node **all_descendants(mris_env_t *env, ir_node *irn) #endif bitset_free(visited); obstack_ptr_grow(&env->obst, NULL); - return obstack_finish(&env->obst); + return (ir_node**)obstack_finish(&env->obst); } static ir_node *put_lowest_in_front(mris_env_t *env, ir_node **in) @@ -362,7 +362,7 @@ static mris_env_t *dump_env = NULL; static void block_walker(ir_node *bl, void *data) { - mris_env_t *env = data; + mris_env_t *env = (mris_env_t*)data; env->bl = bl; lineage_formation(env); fuse_lineages(env);