X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Ftrouts.c;h=8d17939e5055cd64ba95f8f9a75ab015e16d17b6;hb=d5d7159c209a9e5c5fa276f770b5b28a217990a8;hp=90284a2872fdf76738769e18bdec3e2e75d473e0;hpb=99993cb365215de551a6f4d6ffba6f1c996220e9;p=libfirm diff --git a/ir/ana/trouts.c b/ir/ana/trouts.c index 90284a287..8d17939e5 100644 --- a/ir/ana/trouts.c +++ b/ir/ana/trouts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -26,12 +26,12 @@ */ #include "config.h" -#include "irnode.h" #include "trouts.h" #include "array.h" #include "pmap.h" +#include "irnode_t.h" #include "irprog_t.h" #include "irgwalk.h" #include "irnode.h" @@ -52,7 +52,8 @@ static pmap *type_arraytype_map = NULL; * Return a flexible array containing all IR-nodes * that access a given entity. */ -static ir_node **get_entity_access_array(const ir_entity *ent) { +static ir_node **get_entity_access_array(const ir_entity *ent) +{ ir_node **res; if (!entity_access_map) entity_access_map = pmap_create(); @@ -66,8 +67,9 @@ static ir_node **get_entity_access_array(const ir_entity *ent) { return res; } -static void set_entity_access_array(const ir_entity *ent, ir_node **accs) { - ir_node **old = pmap_get(entity_access_map, ent); +static void set_entity_access_array(const ir_entity *ent, ir_node **accs) +{ + ir_node **old = (ir_node**)pmap_get(entity_access_map, ent); if (old != accs) pmap_insert(entity_access_map, ent, (void *)accs); } @@ -76,7 +78,8 @@ static void set_entity_access_array(const ir_entity *ent, ir_node **accs) { * Return a flexible array containing all IR-nodes * that reference a given entity. */ -static ir_node **get_entity_reference_array(const ir_entity *ent) { +static ir_node **get_entity_reference_array(const ir_entity *ent) +{ ir_node **res; if (!entity_reference_map) entity_reference_map = pmap_create(); @@ -90,8 +93,9 @@ static ir_node **get_entity_reference_array(const ir_entity *ent) { return res; } -static void set_entity_reference_array(const ir_entity *ent, ir_node **refs) { - ir_node **old = pmap_get(entity_reference_map, ent); +static void set_entity_reference_array(const ir_entity *ent, ir_node **refs) +{ + ir_node **old = (ir_node**)pmap_get(entity_reference_map, ent); if (old != refs) pmap_insert(entity_reference_map, ent, (void *)refs); } @@ -100,7 +104,8 @@ static void set_entity_reference_array(const ir_entity *ent, ir_node **refs) { * Return a flexible array containing all IR-nodes * that allocate a given type. */ -static ir_node **get_type_alloc_array(const ir_type *tp) { +static ir_node **get_type_alloc_array(const ir_type *tp) +{ ir_node **res; if (!type_alloc_map) type_alloc_map = pmap_create(); @@ -114,8 +119,9 @@ static ir_node **get_type_alloc_array(const ir_type *tp) { return res; } -static void set_type_alloc_array(const ir_type *tp, ir_node **alls) { - ir_node **old = pmap_get(type_alloc_map, tp); +static void set_type_alloc_array(const ir_type *tp, ir_node **alls) +{ + ir_node **old = (ir_node**)pmap_get(type_alloc_map, tp); if (old != alls) pmap_insert(type_alloc_map, tp, (void *)alls); } @@ -124,7 +130,8 @@ static void set_type_alloc_array(const ir_type *tp, ir_node **alls) { * Return a flexible array containing all Cast-nodes * that "create" a given type. */ -static ir_node **get_type_cast_array(const ir_type *tp) { +static ir_node **get_type_cast_array(const ir_type *tp) +{ ir_node **res; if (!type_cast_map) type_cast_map = pmap_create(); @@ -137,8 +144,9 @@ static ir_node **get_type_cast_array(const ir_type *tp) { return res; } -static void set_type_cast_array(const ir_type *tp, ir_node **alls) { - ir_node **old = pmap_get(type_cast_map, tp); +static void set_type_cast_array(const ir_type *tp, ir_node **alls) +{ + ir_node **old = (ir_node**)pmap_get(type_cast_map, tp); if (old != alls) pmap_insert(type_cast_map, tp, (void *)alls); } @@ -147,7 +155,8 @@ static void set_type_cast_array(const ir_type *tp, ir_node **alls) { * Return a flexible array containing all pointer * types that points-to a given type. */ -static ir_type **get_type_pointertype_array(const ir_type *tp) { +static ir_type **get_type_pointertype_array(const ir_type *tp) +{ ir_type **res; if (!type_pointertype_map) type_pointertype_map = pmap_create(); @@ -161,8 +170,9 @@ static ir_type **get_type_pointertype_array(const ir_type *tp) { return res; } -static void set_type_pointertype_array(const ir_type *tp, ir_type **pts) { - ir_type **old = pmap_get(type_pointertype_map, tp); +static void set_type_pointertype_array(const ir_type *tp, ir_type **pts) +{ + ir_type **old = (ir_type**)pmap_get(type_pointertype_map, tp); if (old != pts) pmap_insert(type_pointertype_map, tp, (void *)pts); } @@ -171,7 +181,8 @@ static void set_type_pointertype_array(const ir_type *tp, ir_type **pts) { * Return a flexible array containing all array * types that have a given type as element type. */ -static ir_type **get_type_arraytype_array(const ir_type *tp) { +static ir_type **get_type_arraytype_array(const ir_type *tp) +{ ir_type **res; if (!type_arraytype_map) type_arraytype_map = pmap_create(); @@ -185,8 +196,9 @@ static ir_type **get_type_arraytype_array(const ir_type *tp) { return res; } -void set_type_arraytype_array(const ir_type *tp, ir_type **pts) { - ir_type **old = pmap_get(type_arraytype_map, tp); +static void set_type_arraytype_array(const ir_type *tp, ir_type **pts) +{ + ir_type **old = (ir_type**)pmap_get(type_arraytype_map, tp); if (old != pts) pmap_insert(type_arraytype_map, tp, (void *)pts); } @@ -201,7 +213,8 @@ void set_type_arraytype_array(const ir_type *tp, ir_type **pts) { /* Access routines for entities */ /**------------------------------------------------------------------*/ -int get_entity_n_accesses(const ir_entity *ent) { +size_t get_entity_n_accesses(const ir_entity *ent) +{ ir_node ** accs; assert(ent && is_entity(ent)); @@ -210,16 +223,18 @@ int get_entity_n_accesses(const ir_entity *ent) { return ARR_LEN(accs); } -ir_node *get_entity_access(const ir_entity *ent, int pos) { +ir_node *get_entity_access(const ir_entity *ent, size_t pos) +{ ir_node ** accs; - assert(0 <= pos && pos < get_entity_n_accesses(ent)); + assert(pos < get_entity_n_accesses(ent)); accs = get_entity_access_array(ent); return accs[pos]; } -static void add_entity_access(const ir_entity *ent, ir_node *n) { +static void add_entity_access(const ir_entity *ent, ir_node *n) +{ ir_node ** accs; assert(ent && is_entity(ent)); @@ -230,7 +245,9 @@ static void add_entity_access(const ir_entity *ent, ir_node *n) { set_entity_access_array(ent, accs); } -void set_entity_access(const ir_entity *ent, int pos, ir_node *n) { +#if 0 +void set_entity_access(const ir_entity *ent, int pos, ir_node *n) +{ ir_node ** accs; assert(0 <= pos && pos < get_entity_n_accesses(ent)); @@ -239,10 +256,12 @@ void set_entity_access(const ir_entity *ent, int pos, ir_node *n) { accs = get_entity_access_array(ent); accs[pos] = n; } +#endif /*------------------------------------------------------------------*/ -int get_entity_n_references(const ir_entity *ent) { +size_t get_entity_n_references(const ir_entity *ent) +{ ir_node ** refs; assert(ent && is_entity(ent)); @@ -251,16 +270,18 @@ int get_entity_n_references(const ir_entity *ent) { return ARR_LEN(refs); } -ir_node *get_entity_reference(const ir_entity *ent, int pos) { +ir_node *get_entity_reference(const ir_entity *ent, size_t pos) +{ ir_node ** refs; - assert(0 <= pos && pos < get_entity_n_references(ent)); + assert( pos < get_entity_n_references(ent)); refs = get_entity_reference_array(ent); return refs[pos]; } -static void add_entity_reference(const ir_entity *ent, ir_node *n) { +static void add_entity_reference(const ir_entity *ent, ir_node *n) +{ ir_node ** refs; assert(ent && is_entity(ent)); @@ -271,7 +292,9 @@ static void add_entity_reference(const ir_entity *ent, ir_node *n) { set_entity_reference_array(ent, refs); } -void set_entity_reference(const ir_entity *ent, int pos, ir_node *n) { +#if 0 +void set_entity_reference(const ir_entity *ent, int pos, ir_node *n) +{ ir_node ** refs; assert(0 <= pos && pos < get_entity_n_references(ent)); @@ -280,14 +303,15 @@ void set_entity_reference(const ir_entity *ent, int pos, ir_node *n) { refs = get_entity_reference_array(ent); refs[pos] = n; } - +#endif /**------------------------------------------------------------------*/ /* Access routines for types */ /**------------------------------------------------------------------*/ /* Number of Alloc nodes that create an instance of this type */ -int get_type_n_allocs(const ir_type *tp) { +size_t get_type_n_allocs(const ir_type *tp) +{ ir_node **allocs; assert(tp && is_type(tp)); @@ -297,15 +321,17 @@ int get_type_n_allocs(const ir_type *tp) { } /* Alloc node that creates an instance of this type */ -ir_node *get_type_alloc(const ir_type *tp, int pos) { +ir_node *get_type_alloc(const ir_type *tp, size_t pos) +{ ir_node **allocs; - assert(0 <= pos && pos < get_type_n_allocs(tp)); + assert( pos < get_type_n_allocs(tp)); allocs = get_type_alloc_array(tp); return allocs[pos]; } -static void add_type_alloc(const ir_type *tp, ir_node *n) { +static void add_type_alloc(const ir_type *tp, ir_node *n) +{ ir_node **allocs; assert(tp && is_type(tp)); @@ -316,7 +342,9 @@ static void add_type_alloc(const ir_type *tp, ir_node *n) { set_type_alloc_array(tp, allocs); } -void set_type_alloc(const ir_type *tp, int pos, ir_node *n) { +#if 0 +void set_type_alloc(const ir_type *tp, int pos, ir_node *n) +{ ir_node **allocs; assert(0 <= pos && pos < get_type_n_allocs(tp)); @@ -325,9 +353,11 @@ void set_type_alloc(const ir_type *tp, int pos, ir_node *n) { allocs = get_type_alloc_array(tp); allocs[pos] = n; } +#endif /* Number of Cast nodes that create an instance of this type */ -int get_type_n_casts(const ir_type *tp) { +size_t get_type_n_casts(const ir_type *tp) +{ ir_node **casts; assert(tp && is_type(tp)); @@ -337,9 +367,10 @@ int get_type_n_casts(const ir_type *tp) { } -int get_class_n_upcasts(const ir_type *clss) { - int i, n_casts = get_type_n_casts(clss); - int n_instances = 0; +size_t get_class_n_upcasts(const ir_type *clss) +{ + size_t i, n_casts = get_type_n_casts(clss); + size_t n_instances = 0; for (i = 0; i < n_casts; ++i) { ir_node *cast = get_type_cast(clss, i); if (is_Cast_upcast(cast)) @@ -348,9 +379,10 @@ int get_class_n_upcasts(const ir_type *clss) { return n_instances; } -int get_class_n_downcasts(const ir_type *clss) { - int i, n_casts = get_type_n_casts(clss); - int n_instances = 0; +size_t get_class_n_downcasts(const ir_type *clss) +{ + size_t i, n_casts = get_type_n_casts(clss); + size_t n_instances = 0; for (i = 0; i < n_casts; ++i) { ir_node *cast = get_type_cast(clss, i); if (is_Cast_downcast(cast)) @@ -360,15 +392,17 @@ int get_class_n_downcasts(const ir_type *clss) { } /* Cast node that creates an instance of this type */ -ir_node *get_type_cast(const ir_type *tp, int pos) { +ir_node *get_type_cast(const ir_type *tp, size_t pos) +{ ir_node **casts; - assert(0 <= pos && pos < get_type_n_casts(tp)); + assert(pos < get_type_n_casts(tp)); casts = get_type_cast_array(tp); return casts[pos]; } -void add_type_cast(const ir_type *tp, ir_node *n) { +void add_type_cast(const ir_type *tp, ir_node *n) +{ ir_node **casts; assert(tp && is_type(tp)); @@ -379,19 +413,23 @@ void add_type_cast(const ir_type *tp, ir_node *n) { set_type_cast_array(tp, casts); } -void set_type_cast(const ir_type *tp, int pos, ir_node *n) { +#if 0 +void set_type_cast(const ir_type *tp, size_t pos, ir_node *n) +{ ir_node **casts; - assert(0 <= pos && pos < get_type_n_casts(tp)); + assert(pos < get_type_n_casts(tp)); assert(n && is_ir_node(n)); casts = get_type_cast_array(tp); casts[pos] = n; } +#endif /*------------------------------------------------------------------*/ -int get_type_n_pointertypes_to(const ir_type *tp) { +size_t get_type_n_pointertypes_to(const ir_type *tp) +{ ir_type ** pts; assert(tp && is_type(tp)); @@ -400,27 +438,31 @@ int get_type_n_pointertypes_to(const ir_type *tp) { return ARR_LEN(pts); } -ir_type *get_type_pointertype_to(const ir_type *tp, int pos) { +ir_type *get_type_pointertype_to(const ir_type *tp, size_t pos) +{ ir_type ** pts; - assert(0 <= pos && pos < get_type_n_pointertypes_to(tp)); + assert(pos < get_type_n_pointertypes_to(tp)); pts = get_type_pointertype_array(tp); return pts[pos]; } -void add_type_pointertype_to(const ir_type *tp, ir_type *ptp) { +void add_type_pointertype_to(const ir_type *tp, ir_type *ptp) +{ ir_type ** pts; assert(tp && is_type(tp)); assert(ptp && is_Pointer_type(ptp)); pts = get_type_pointertype_array(tp); - ARR_APP1(ir_node *, pts, ptp); + ARR_APP1(ir_type*, pts, ptp); set_type_pointertype_array(tp, pts); } -void set_type_pointertype_to(const ir_type *tp, int pos, ir_type *ptp) { +#if 0 +void set_type_pointertype_to(const ir_type *tp, int pos, ir_type *ptp) +{ ir_type ** pts; assert(0 <= pos && pos < get_type_n_pointertypes_to(tp)); @@ -429,11 +471,12 @@ void set_type_pointertype_to(const ir_type *tp, int pos, ir_type *ptp) { pts = get_type_pointertype_array(tp); pts[pos] = ptp; } - +#endif /*------------------------------------------------------------------*/ -int get_type_n_arraytypes_of(const ir_type *tp) { +size_t get_type_n_arraytypes_of(const ir_type *tp) +{ ir_type ** pts; assert(tp && is_type(tp)); @@ -442,27 +485,31 @@ int get_type_n_arraytypes_of(const ir_type *tp) { return ARR_LEN(pts); } -ir_type *get_type_arraytype_of(const ir_type *tp, int pos) { +ir_type *get_type_arraytype_of(const ir_type *tp, size_t pos) +{ ir_type ** pts; - assert(0 <= pos && pos < get_type_n_arraytypes_of(tp)); + assert(pos < get_type_n_arraytypes_of(tp)); pts = get_type_arraytype_array(tp); return pts[pos]; } -void add_type_arraytype_of(const ir_type *tp, ir_type *atp) { +void add_type_arraytype_of(const ir_type *tp, ir_type *atp) +{ ir_type ** pts; assert(tp && is_type(tp)); assert(atp && is_Array_type(atp)); pts = get_type_arraytype_array(tp); - ARR_APP1(ir_node *, pts, atp); + ARR_APP1(ir_type*, pts, atp); set_type_arraytype_array(tp, pts); } -void set_type_arraytype_of(const ir_type *tp, int pos, ir_type *atp) { +#if 0 +void set_type_arraytype_of(const ir_type *tp, int pos, ir_type *atp) +{ ir_type ** pts; assert(0 <= pos && pos < get_type_n_arraytypes_of(tp)); @@ -471,28 +518,33 @@ void set_type_arraytype_of(const ir_type *tp, int pos, ir_type *atp) { pts = get_type_arraytype_array(tp); pts[pos] = atp; } +#endif /*------------------------------------------------------------------*/ /* Building and Removing the out datastructure */ /*------------------------------------------------------------------*/ /** Initialize the trouts handling. */ -static void init_trouts(void) { +static void init_trouts(void) +{ } /** The number of entities that can be accessed by this Sel node. */ -static int get_Sel_n_accessed_entities(const ir_node *sel) { +static int get_Sel_n_accessed_entities(const ir_node *sel) +{ (void) sel; return 1; } /** The entity that cat be accessed by this Sel node. */ -static ir_entity *get_Sel_accessed_entity(const ir_node *sel) { +static ir_entity *get_Sel_accessed_entity(const ir_node *sel) +{ return get_Sel_entity(sel); } /** An addr node is a SymConst or a Sel. */ -static int get_addr_n_entities(const ir_node *addr) { +static int get_addr_n_entities(const ir_node *addr) +{ switch (get_irn_opcode(addr)) { case iro_Sel: /* Treat jack array sels? */ @@ -508,7 +560,8 @@ static int get_addr_n_entities(const ir_node *addr) { /** An addr node is a SymConst or a Sel. If Sel follow to outermost of compound. */ -static ir_entity *get_addr_entity(const ir_node *addr, int pos) { +static ir_entity *get_addr_entity(const ir_node *addr, int pos) +{ ir_node *ptr; (void) pos; @@ -533,7 +586,8 @@ static ir_entity *get_addr_entity(const ir_node *addr, int pos) { } } -static void chain_accesses(ir_node *n, void *env) { +static void chain_accesses(ir_node *n, void *env) +{ int i, n_ents; ir_node *addr; @@ -573,7 +627,8 @@ static void chain_accesses(ir_node *n, void *env) { * Handle chain types (pointer, array) by adding them to * its "inner" type. */ -static void chain_types(ir_type *tp) { +static void chain_types(ir_type *tp) +{ if (is_Pointer_type(tp)) { add_type_pointertype_to(get_pointer_points_to_type(tp), tp); } else if (is_Array_type(tp)) { @@ -581,43 +636,50 @@ static void chain_types(ir_type *tp) { } } -irg_outs_state get_trouts_state(void) { +irg_outs_state get_trouts_state(void) +{ return irp->trouts_state; } -void set_trouts_inconsistent(void) { +void set_trouts_inconsistent(void) +{ if (irp->trouts_state == outs_consistent) irp->trouts_state = outs_inconsistent; } /* compute the trouts data structures. */ -void compute_trouts(void) { - int i; +void compute_trouts(void) +{ + size_t i; free_trouts(); init_trouts(); /* Compute outs for IR nodes. */ - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - irg_walk_graph(get_irp_irg(i), NULL, chain_accesses, NULL); + for (i = get_irp_n_irgs(); i > 0;) { + ir_graph *irg = get_irp_irg(--i); + irg_walk_graph(irg, NULL, chain_accesses, NULL); } walk_const_code(NULL, chain_accesses, NULL); /* Compute outs for types */ - for (i = get_irp_n_types() - 1; i >= 0; --i) { - chain_types(get_irp_type(i)); + for (i = get_irp_n_types(); i > 0;) { + ir_type *type = get_irp_type(--i); + chain_types(type); } irp->trouts_state = outs_consistent; } -void free_trouts(void) { +void free_trouts(void) +{ if (entity_access_map) { ir_node **accs; for (accs = (ir_node **)pmap_first(entity_access_map); accs; - accs = (ir_node **)pmap_next(entity_access_map)) - ; //DEL_ARR_F(accs); + accs = (ir_node **)pmap_next(entity_access_map)) { + /* DEL_ARR_F(accs); */ + } pmap_destroy(entity_access_map); entity_access_map = NULL; } @@ -626,8 +688,9 @@ void free_trouts(void) { ir_node **refs; for (refs = (ir_node **)pmap_first(entity_reference_map); refs; - refs = (ir_node **)pmap_next(entity_reference_map)) - ; //DEL_ARR_F(refs); + refs = (ir_node **)pmap_next(entity_reference_map)) { + /* DEL_ARR_F(refs); */ + } pmap_destroy(entity_reference_map); entity_reference_map = NULL; } @@ -636,8 +699,9 @@ void free_trouts(void) { ir_node **alls; for (alls = (ir_node **)pmap_first(type_alloc_map); alls; - alls = (ir_node **)pmap_next(type_alloc_map)) - ; //DEL_ARR_F(alls); + alls = (ir_node **)pmap_next(type_alloc_map)) { + /* DEL_ARR_F(alls); */ + } pmap_destroy(type_alloc_map); type_alloc_map = NULL; } @@ -646,8 +710,9 @@ void free_trouts(void) { ir_node **casts; for (casts = (ir_node **)pmap_first(type_cast_map); casts; - casts = (ir_node **)pmap_next(type_cast_map)) - ; //DEL_ARR_F(alls); + casts = (ir_node **)pmap_next(type_cast_map)) { + /* DEL_ARR_F(alls); */ + } pmap_destroy(type_cast_map); type_cast_map = NULL; } @@ -656,8 +721,9 @@ void free_trouts(void) { ir_node **pts; for (pts = (ir_node **)pmap_first(type_pointertype_map); pts; - pts = (ir_node **)pmap_next(type_pointertype_map)) - ; //DEL_ARR_F(pts); + pts = (ir_node **)pmap_next(type_pointertype_map)) { + /* DEL_ARR_F(pts); */ + } pmap_destroy(type_pointertype_map); type_pointertype_map = NULL; } @@ -666,8 +732,9 @@ void free_trouts(void) { ir_node **pts; for (pts = (ir_node **)pmap_first(type_arraytype_map); pts; - pts = (ir_node **)pmap_next(type_arraytype_map)) - ; //DEL_ARR_F(pts); + pts = (ir_node **)pmap_next(type_arraytype_map)) { + /* DEL_ARR_F(pts); */ + } pmap_destroy(type_arraytype_map); type_arraytype_map = NULL; }