X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fircgopt.c;h=c95e0a52a640e3d9ff65541254f709bc60e2f218;hb=762b472fc81c73cf7a1b0041b8cd286b7206d79d;hp=c1a24956f265756c96939df003824eef8c7b93a9;hpb=2bc2dd4bd4f64982e9c5d2f1ea70d63d0eb10044;p=libfirm

diff --git a/ir/opt/ircgopt.c b/ir/opt/ircgopt.c
index c1a24956f..c95e0a52a 100644
--- a/ir/opt/ircgopt.c
+++ b/ir/opt/ircgopt.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.
  *
@@ -27,7 +27,7 @@
 
 /*
  * Entfernen von nicht erreichbaren (aufrufbaren) Methoden. Die Menge
- * der nicht erreichbaren Methoden wird aus der Abschätzung der
+ * der nicht erreichbaren Methoden wird aus der Abschätzung der
  * Aufrufrelation bestimmt.
  */
 #include "config.h"
@@ -50,8 +50,9 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg);
 /**
  * Walker: adds Call operations to a head's link list.
  */
-static void collect_call(ir_node *node, void *env) {
-	ir_node *head = env;
+static void collect_call(ir_node *node, void *env)
+{
+	ir_node *head = (ir_node*)env;
 
 	if (is_Call(node)) {
 		set_irn_link(node, get_irn_link(head));
@@ -60,10 +61,10 @@ static void collect_call(ir_node *node, void *env) {
 }
 
 /* garbage collect methods: mark and remove */
-void gc_irgs(int n_keep, ir_entity ** keep_arr)
+void gc_irgs(size_t n_keep, ir_entity ** keep_arr)
 {
 	void * MARK = &MARK; /* @@@ gefaehrlich!!! Aber wir markieren hoechstens zu viele ... */
-	int i;
+	size_t i, n;
 
 	FIRM_DBG_REGISTER(dbg, "firm.opt.cgopt");
 
@@ -77,14 +78,16 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr)
 	/* Mark entities that are alive.  */
 	if (n_keep > 0) {
 		ir_entity **marked = NEW_ARR_F(ir_entity *, n_keep);
-		for (i = 0; i < n_keep; ++i) {
-			marked[i] = keep_arr[i];
-			set_entity_link(marked[i], MARK);
-			DB((dbg, LEVEL_1, "  method %+F kept alive.\n",	marked[i]));
+		size_t    idx;
+
+		for (idx = 0; idx < n_keep; ++idx) {
+			marked[idx] = keep_arr[idx];
+			set_entity_link(marked[idx], MARK);
+			DB((dbg, LEVEL_1, "  method %+F kept alive.\n", marked[idx]));
 		}
 
-		for (i = 0; i < ARR_LEN(marked); ++i) {
-			ir_graph *irg = get_entity_irg(marked[i]);
+		for (idx = 0; idx < ARR_LEN(marked); ++idx) {
+			ir_graph *irg = get_entity_irg(marked[idx]);
 			ir_node *node;
 
 			if (irg == NULL)
@@ -97,12 +100,13 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr)
 			irg_walk_graph(irg, firm_clear_link, collect_call, node);
 
 			/* iterate calls */
-			for (node = get_irn_link(node); node; node = get_irn_link(node)) {
-				int i;
+			for (node = (ir_node*)get_irn_link(node); node != NULL;
+			     node = (ir_node*)get_irn_link(node)) {
+				size_t i;
 				assert(is_Call(node));
 
-				for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
-					ir_entity *ent = get_Call_callee(node, i);
+				for (i = get_Call_n_callees(node); i > 0;) {
+					ir_entity *ent = get_Call_callee(node, --i);
 
 					if (get_entity_irg(ent) && get_entity_link(ent) != MARK) {
 						set_entity_link(ent, MARK);
@@ -119,17 +123,17 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr)
 	}
 
 	/* clean */
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		ir_graph  *irg = get_irp_irg(i);
 		ir_entity *ent = get_irg_entity(irg);
 
 		if (get_entity_link(ent) == MARK)
 			continue;
 
-		DB((dbg, LEVEL_1, "  freeing method %+F\n",	ent));
+		DB((dbg, LEVEL_1, "  freeing method %+F\n", ent));
 		remove_irp_irg(irg);
 
-		remove_class_member(get_entity_owner(ent), ent);
+		free_entity(ent);
 	}
 }
 
@@ -139,17 +143,17 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr)
 static void pass_wrapper(void)
 {
     ir_entity **keep_methods;
-    int         arr_len;
+    size_t    arr_len;
 
     /* Analysis that finds the free methods,
        i.e. methods that are dereferenced.
        Optimizes polymorphic calls :-). */
-    cgana(&arr_len, &keep_methods);
+    arr_len = cgana(&keep_methods);
 
     /* Remove methods that are never called. */
     gc_irgs(arr_len, keep_methods);
 
-    free(keep_methods);
+    xfree(keep_methods);
 }
 
 ir_prog_pass_t *gc_irgs_pass(const char *name)