BugFix:

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index a1e2655..77ac607 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -11,10 +11,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
 #endif
 
 # include <stdio.h>
+
 # include "ident_t.h"
 # include "firm.h"
 # include "mangle.h"
@@ -30,6 +35,10 @@
 # include "type_identify.h"
 # include "firmstat.h"
 # include "irreflect_t.h"
+# include "irarch.h"
+# include "reassoc_t.h"
+# include "irhooks.h"
+# include "iredges_t.h"
 
 void
 init_firm(const firm_parameter_t *param)
@@ -50,14 +59,21 @@ init_firm(const firm_parameter_t *param)
     memcpy(&def_params, param, size);
   }
 
+
   /* initialize all ident stuff */
-  init_ident(1024);
-  /* enhanced statistics, need idents */
+  init_ident(def_params.id_if, 1024);
+  /* initialize Firm hooks */
+  init_hooks();
+  /* enhanced statistics, need idents and hooks */
   init_stat(def_params.enable_statistics);
+  /* Edges need hooks. */
+  init_edges();
   /* create the type kinds. */
   init_tpop();
   /* create an obstack and put all tarvals in a pdeq */
   init_tarval_1();
+  /* Builds a basic program representation, so modes can be added. */
+  init_irprog_1();
   /* initialize all modes an ir node can consist of */
   init_mode();
   /* initialize tarvals, and floating point arithmetic */
@@ -66,35 +82,44 @@ init_firm(const firm_parameter_t *param)
   init_irgraph();
   /* kind of obstack initialization */
   firm_init_mangle();
-  /* initalize all op codes an irnode can consist of */
+  /* initialize all op codes an irnode can consist of */
   init_op();
   /* called once for each run of this library */
   init_cons(def_params.initialize_local_func);
+  /* initialize reassociation */
+  firm_init_reassociation();
   /* Builds a construct allowing to access all information to be constructed
      later. */
-  init_irprog();
+  init_irprog_2();
   /* Constructs some idents needed. */
-  init_type();
+  firm_init_type(NULL);
+  init_entity();
   /* allocate a hash table. */
-  init_type_identify(def_params.compare_types_func, def_params.hash_types_func);
+  init_type_identify(def_params.ti_if);
   /* Init reflection facility. */
-  init_rflct();
+  firm_init_rflct();
+
+  /* Init architecture dependent optimizations. */
+  arch_dep_init(arch_dep_default_factory);
+  arch_dep_set_opts(arch_dep_mul_to_shift | arch_dep_div_by_const | arch_dep_mod_by_const);
 
+  firm_archops_init(def_params.arch_op_settings);
 }
 
 
 void free_firm(void) {
   int i;
 
-  for (i = 0; i < get_irp_n_irgs(); i++)
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
     free_ir_graph(get_irp_irg(i));
 
-  for (i = 0; i < get_irp_n_types(); i++) {
+  free_type_entities(get_glob_type());
+  for (i = get_irp_n_types() - 1; i >= 0; --i)
     free_type_entities(get_irp_type(i));
+
+  for (i = get_irp_n_types() - 1; i >= 0; --i)
     free_type(get_irp_type(i));
-  }
 
-  free_type_entities(get_glob_type());
   free_ir_prog();
 
   finish_tarval();