X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=2c5fb69e13be0427c81382a786263cc3adbc7bf1;hb=e775a978fff2841e0722c47f13545b54d48b8f98;hp=e35f9cb9cd072ec039842713a0b6a2b8fc8bedb9;hpb=4d6c06673e8fc5d144bfe16397697ff2812fc22e;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index e35f9cb9c..2c5fb69e1 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.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.
  *
@@ -127,9 +127,9 @@ void ir_init(const firm_parameter_t *param)
 	   later. */
 	init_irprog_2();
 	/* Initialize the type module and construct some idents needed. */
-	firm_init_type();
+	ir_init_type();
 	/* initialize the entity module */
-	firm_init_entity();
+	ir_init_entity();
 	/* class cast optimization */
 	firm_init_class_casts_opt();
 	/* memory disambiguation */
@@ -137,8 +137,7 @@ void ir_init(const firm_parameter_t *param)
 	firm_init_loop_opt();
 
 	/* Init architecture dependent optimizations. */
-	arch_dep_init(arch_dep_default_factory);
-	arch_dep_set_opts(0);
+	arch_dep_set_opts(arch_dep_none);
 
 	init_irnode();
 
@@ -150,22 +149,25 @@ void ir_init(const firm_parameter_t *param)
 
 void ir_finish(void)
 {
-	int i;
+	size_t i;
 
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-		free_ir_graph(get_irp_irg(i));
-	for (i = get_irp_n_pseudo_irgs() - 1; i >= 0; --i)
-		free_ir_graph(get_irp_pseudo_irg(i));
+	/* must iterate backwards here */
+	for (i = get_irp_n_irgs(); i > 0;)
+		free_ir_graph(get_irp_irg(--i));
 
 	free_type_entities(get_glob_type());
-	for (i = get_irp_n_types() - 1; i >= 0; --i)
-		free_type_entities(get_irp_type(i));
+	/* must iterate backwards here */
+	for (i = get_irp_n_types(); i > 0;)
+		free_type_entities(get_irp_type(--i));
 
-	for (i = get_irp_n_types() - 1; i >= 0; --i)
-		free_type(get_irp_type(i));
+	for (i = get_irp_n_types(); i > 0;)
+		free_type(get_irp_type(--i));
 
 	free_ir_prog();
 
+	ir_finish_entity();
+	ir_finish_type();
+
 	finish_tarval();
 	finish_mode();
 	finish_tpop();