X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Ftrouts.c;h=c0740c25e6f9627671a45ed088168a3fb98feb05;hb=30369d28b8fabe4f66cee12f42ee475d9444cf9e;hp=0b0abc2fc282aa99cf614bb3b0e092edaffc4251;hpb=c79fe4adc914d8d867772053bedf449a4f85645d;p=libfirm

diff --git a/ir/ana/trouts.c b/ir/ana/trouts.c
index 0b0abc2fc..c0740c25e 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.
  *
@@ -22,11 +22,10 @@
  * @brief    Reverse edges that reference types/entities.
  * @author   Goetz Lindenmaier
  * @date     29.10.2004
- * @version  $Id$
  */
 #include "config.h"
 
-#include "trouts.h"
+#include "trouts_t.h"
 
 #include "array.h"
 #include "pmap.h"
@@ -54,12 +53,10 @@ static pmap *type_arraytype_map = NULL;
  */
 static ir_node **get_entity_access_array(const ir_entity *ent)
 {
-	ir_node **res;
 	if (!entity_access_map) entity_access_map = pmap_create();
 
-	if (pmap_contains(entity_access_map, ent)) {
-		res = (ir_node **) pmap_get(entity_access_map, ent);
-	} else {
+	ir_node **res = pmap_get(ir_node*, entity_access_map, ent);
+	if (!res) {
 		res = NEW_ARR_F(ir_node *, 0);
 		pmap_insert(entity_access_map, ent, (void *)res);
 	}
@@ -69,9 +66,7 @@ static ir_node **get_entity_access_array(const ir_entity *ent)
 
 static void set_entity_access_array(const ir_entity *ent, ir_node **accs)
 {
-	ir_node **old = pmap_get(entity_access_map, ent);
-	if (old != accs)
-		pmap_insert(entity_access_map, ent, (void *)accs);
+	pmap_insert(entity_access_map, ent, (void *)accs);
 }
 
 /**
@@ -80,12 +75,10 @@ static void set_entity_access_array(const ir_entity *ent, ir_node **accs)
  */
 static ir_node **get_entity_reference_array(const ir_entity *ent)
 {
-	ir_node **res;
 	if (!entity_reference_map) entity_reference_map = pmap_create();
 
-	if (pmap_contains(entity_reference_map, ent)) {
-		res = (ir_node **) pmap_get(entity_reference_map, ent);
-	} else {
+	ir_node **res = pmap_get(ir_node*, entity_reference_map, ent);
+	if (!res) {
 		res = NEW_ARR_F(ir_node *, 0);
 		pmap_insert(entity_reference_map, ent, (void *)res);
 	}
@@ -95,9 +88,7 @@ static ir_node **get_entity_reference_array(const ir_entity *ent)
 
 static void set_entity_reference_array(const ir_entity *ent, ir_node **refs)
 {
-	ir_node **old = pmap_get(entity_reference_map, ent);
-	if (old != refs)
-		pmap_insert(entity_reference_map, ent, (void *)refs);
+	pmap_insert(entity_reference_map, ent, (void *)refs);
 }
 
 /**
@@ -106,12 +97,10 @@ static void set_entity_reference_array(const ir_entity *ent, ir_node **refs)
  */
 static ir_node **get_type_alloc_array(const ir_type *tp)
 {
-	ir_node **res;
 	if (!type_alloc_map) type_alloc_map = pmap_create();
 
-	if (pmap_contains(type_alloc_map, tp)) {
-		res = (ir_node **) pmap_get(type_alloc_map, tp);
-	} else {
+	ir_node **res = pmap_get(ir_node*, type_alloc_map, tp);
+	if (!res) {
 		res = NEW_ARR_F(ir_node *, 0);
 		pmap_insert(type_alloc_map, tp, (void *)res);
 	}
@@ -121,9 +110,7 @@ static ir_node **get_type_alloc_array(const ir_type *tp)
 
 static void set_type_alloc_array(const ir_type *tp, ir_node **alls)
 {
-	ir_node **old = pmap_get(type_alloc_map, tp);
-	if (old != alls)
-		pmap_insert(type_alloc_map, tp, (void *)alls);
+	pmap_insert(type_alloc_map, tp, (void *)alls);
 }
 
 /**
@@ -132,12 +119,10 @@ static void set_type_alloc_array(const ir_type *tp, ir_node **alls)
  */
 static ir_node **get_type_cast_array(const ir_type *tp)
 {
-	ir_node **res;
 	if (!type_cast_map) type_cast_map = pmap_create();
 
-	if (pmap_contains(type_cast_map, tp)) {
-		res = (ir_node **) pmap_get(type_cast_map, tp);
-	} else {
+	ir_node **res = pmap_get(ir_node*, type_cast_map, tp);
+	if (!res) {
 		res = NEW_ARR_F(ir_node *, 0);
 		pmap_insert(type_cast_map, tp, (void *)res);
 	}
@@ -146,9 +131,7 @@ static ir_node **get_type_cast_array(const ir_type *tp)
 
 static void set_type_cast_array(const ir_type *tp, ir_node **alls)
 {
-	ir_node **old = pmap_get(type_cast_map, tp);
-	if (old != alls)
-		pmap_insert(type_cast_map, tp, (void *)alls);
+	pmap_insert(type_cast_map, tp, (void *)alls);
 }
 
 /**
@@ -157,12 +140,10 @@ static void set_type_cast_array(const ir_type *tp, ir_node **alls)
  */
 static ir_type **get_type_pointertype_array(const ir_type *tp)
 {
-	ir_type **res;
 	if (!type_pointertype_map) type_pointertype_map = pmap_create();
 
-	if (pmap_contains(type_pointertype_map, tp)) {
-		res = (ir_type **) pmap_get(type_pointertype_map, tp);
-	} else {
+	ir_type **res = pmap_get(ir_type*, type_pointertype_map, tp);
+	if (!res) {
 		res = NEW_ARR_F(ir_type *, 0);
 		pmap_insert(type_pointertype_map, tp, (void *)res);
 	}
@@ -172,9 +153,7 @@ static ir_type **get_type_pointertype_array(const ir_type *tp)
 
 static void set_type_pointertype_array(const ir_type *tp, ir_type **pts)
 {
-	ir_type **old = pmap_get(type_pointertype_map, tp);
-	if (old != pts)
-		pmap_insert(type_pointertype_map, tp, (void *)pts);
+	pmap_insert(type_pointertype_map, tp, (void *)pts);
 }
 
 /**
@@ -183,12 +162,10 @@ static void set_type_pointertype_array(const ir_type *tp, ir_type **pts)
  */
 static ir_type **get_type_arraytype_array(const ir_type *tp)
 {
-	ir_type **res;
 	if (!type_arraytype_map) type_arraytype_map = pmap_create();
 
-	if (pmap_contains(type_arraytype_map, tp)) {
-		res = (ir_type **) pmap_get(type_arraytype_map, tp);
-	} else {
+	ir_type **res = pmap_get(ir_type*, type_arraytype_map, tp);
+	if (!res) {
 		res = NEW_ARR_F(ir_type *, 0);
 		pmap_insert(type_arraytype_map, tp, (void *)res);
 	}
@@ -198,9 +175,7 @@ static ir_type **get_type_arraytype_array(const ir_type *tp)
 
 static void set_type_arraytype_array(const ir_type *tp, ir_type **pts)
 {
-	ir_type **old = pmap_get(type_arraytype_map, tp);
-	if (old != pts)
-		pmap_insert(type_arraytype_map, tp, (void *)pts);
+	pmap_insert(type_arraytype_map, tp, (void *)pts);
 }
 
 /*------------------------------------------------------------------*/
@@ -213,7 +188,7 @@ static 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;
 
@@ -223,11 +198,11 @@ 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];
@@ -260,7 +235,7 @@ void set_entity_access(const ir_entity *ent, int pos, ir_node *n)
 
 /*------------------------------------------------------------------*/
 
-int get_entity_n_references(const ir_entity *ent)
+size_t get_entity_n_references(const ir_entity *ent)
 {
 	ir_node ** refs;
 
@@ -270,11 +245,11 @@ 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];
@@ -310,7 +285,7 @@ void set_entity_reference(const ir_entity *ent, int pos, ir_node *n)
 /**------------------------------------------------------------------*/
 
 /* 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;
 
@@ -321,10 +296,10 @@ 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];
@@ -356,7 +331,7 @@ void set_type_alloc(const ir_type *tp, int pos, ir_node *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;
 
@@ -367,10 +342,10 @@ int get_type_n_casts(const ir_type *tp)
 }
 
 
-int get_class_n_upcasts(const ir_type *clss)
+size_t get_class_n_upcasts(const ir_type *clss)
 {
-	int i, n_casts = get_type_n_casts(clss);
-	int n_instances = 0;
+	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))
@@ -379,10 +354,10 @@ int get_class_n_upcasts(const ir_type *clss)
 	return n_instances;
 }
 
-int get_class_n_downcasts(const ir_type *clss)
+size_t get_class_n_downcasts(const ir_type *clss)
 {
-	int i, n_casts = get_type_n_casts(clss);
-	int n_instances = 0;
+	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))
@@ -391,11 +366,10 @@ int get_class_n_downcasts(const ir_type *clss)
 	return n_instances;
 }
 
-/* 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];
@@ -414,11 +388,11 @@ void add_type_cast(const ir_type *tp, ir_node *n)
 }
 
 #if 0
-void set_type_cast(const ir_type *tp, int pos, ir_node *n)
+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);
@@ -428,7 +402,7 @@ void set_type_cast(const ir_type *tp, int pos, ir_node *n)
 
 /*------------------------------------------------------------------*/
 
-int get_type_n_pointertypes_to(const ir_type *tp)
+size_t get_type_n_pointertypes_to(const ir_type *tp)
 {
 	ir_type ** pts;
 
@@ -438,11 +412,11 @@ 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];
@@ -456,7 +430,7 @@ void add_type_pointertype_to(const ir_type *tp, ir_type *ptp)
 	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);
 }
 
@@ -475,7 +449,7 @@ void set_type_pointertype_to(const ir_type *tp, int pos, ir_type *ptp)
 
 /*------------------------------------------------------------------*/
 
-int get_type_n_arraytypes_of(const ir_type *tp)
+size_t get_type_n_arraytypes_of(const ir_type *tp)
 {
 	ir_type ** pts;
 
@@ -485,11 +459,11 @@ 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];
@@ -503,7 +477,7 @@ void  add_type_arraytype_of(const ir_type *tp, ir_type *atp)
 	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);
 }
 
@@ -604,8 +578,10 @@ static void chain_accesses(ir_node *n, void *env)
 	} else if (is_SymConst_addr_ent(n)) {
 		add_entity_reference(get_SymConst_entity(n), n);
 		return;
-	} else if (is_memop(n)) {
-		addr = get_memop_ptr(n);
+	} else if (is_Store(n)) {
+		addr = get_Store_ptr(n);
+	} else if (is_Load(n)) {
+		addr = get_Load_ptr(n);
 	} else if (is_Call(n)) {
 		addr = get_Call_ptr(n);
 		if (! is_Sel(addr)) return;  /* Sels before Calls mean a Load / polymorphic Call. */
@@ -636,37 +612,25 @@ static void chain_types(ir_type *tp)
 	}
 }
 
-irg_outs_state get_trouts_state(void)
-{
-	return irp->trouts_state;
-}
-
-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;
+	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)
@@ -736,6 +700,4 @@ void free_trouts(void)
 		pmap_destroy(type_arraytype_map);
 		type_arraytype_map = NULL;
 	}
-
-	irp->trouts_state = outs_none;
 }