X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=c28abd8f12b794ff85bf2c5643a4aa0d015f9fb6;hb=183c08a8d00578cfc700cdd0d8387b920a5996da;hp=ad373470c75e70efba90e29460c0f0b70076bcc8;hpb=43332529cf18bf9f2a0ecb384dc5dd0093eb3c8a;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index ad373470c..c28abd8f1 100644
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.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,7 +22,6 @@
  * @brief   Optimize the frame type.
  * @date    15.03.2006
  * @author  Michael Beck
- * @version $Id$
  * @brief
  *   Optimize the frame type by removing unused type members.
  */
@@ -44,16 +43,16 @@ void opt_frame_irg(ir_graph *irg)
 	ir_type   *frame_tp = get_irg_frame_type(irg);
 	ir_entity *ent, *list;
 	ir_node   *frame, *sel;
-	int       i, n = get_class_n_members(frame_tp);
+	size_t    i, n = get_class_n_members(frame_tp);
 
 	if (n <= 0)
 		return;
 
-	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
 	/* clear all entity links */
-	for (i = n - 1; i >= 0; --i) {
-		ent = get_class_member(frame_tp, i);
+	for (i = n; i > 0;) {
+		ent = get_class_member(frame_tp, --i);
 		set_entity_link(ent, NULL);
 	}
 
@@ -72,6 +71,8 @@ void opt_frame_irg(ir_graph *irg)
 			}
 		}
 	} else {
+		int i;
+
 		/* use traditionally out edges */
 		assure_irg_outs(irg);
 
@@ -89,8 +90,8 @@ void opt_frame_irg(ir_graph *irg)
 
 	/* link unused ones */
 	list = NULL;
-	for (i = n - 1; i >= 0; --i) {
-		ent = get_class_member(frame_tp, i);
+	for (i = n; i > 0;) {
+		ent = get_class_member(frame_tp, --i);
 		/* beware of inner functions: those are NOT unused */
 		if (get_entity_link(ent) == NULL && !is_method_entity(ent)) {
 			set_entity_link(ent, list);
@@ -101,13 +102,13 @@ void opt_frame_irg(ir_graph *irg)
 	if (list != NULL) {
 		/* delete list members */
 		for (ent = list; ent; ent = list) {
-			list = get_entity_link(ent);
+			list = (ir_entity*)get_entity_link(ent);
 			free_entity(ent);
 		}
-		/* we changed the frame type, it's layout should be redefined */
+		/* we changed the frame type, its layout should be redefined */
 		set_type_state(frame_tp, layout_undefined);
 	}
-	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 }
 
 ir_graph_pass_t *opt_frame_irg_pass(const char *name)