remove the infrastructure for using a custom identifier module and simply always...

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index fbe300c..e35f9cb 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -37,7 +37,6 @@
 #include "ident_t.h"
 #include "firm.h"
 #include "irflag_t.h"
-/* init functions are not public */
 #include "tv_t.h"
 #include "tpop_t.h"
 #include "irprog_t.h"
@@ -55,6 +54,7 @@
 #include "opt_init.h"
 #include "debugger.h"
 #include "be_t.h"
+#include "irtools.h"
 
 /* returns the firm root */
 lc_opt_entry_t *firm_opt_get_root(void)
@@ -89,9 +89,10 @@ void ir_init(const firm_parameter_t *param)
        /* initialize firm flags */
        firm_init_flags();
        /* initialize all ident stuff */
-       init_ident(def_params.id_if, 1024);
+       init_ident();
        /* enhanced statistics, need idents and hooks */
-       firm_init_stat(def_params.enable_statistics);
+       if (def_params.enable_statistics != 0)
+               firm_init_stat(def_params.enable_statistics);
        /* Edges need hooks. */
        init_edges();
        /* create the type kinds. */
@@ -111,7 +112,9 @@ void ir_init(const firm_parameter_t *param)
        /* initialize all op codes an irnode can consist of */
        init_op();
        /* called once for each run of this library */
-       firm_init_cons(def_params.initialize_local_func);
+       if (def_params.initialize_local_func != NULL)
+               ir_set_uninitialized_local_variable_func(
+                               def_params.initialize_local_func);
        /* initialize reassociation */
        firm_init_reassociation();
        /* initialize function call optimization */
@@ -124,11 +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(def_params.builtin_dbg, def_params.cc_mask);
+       firm_init_type();
        /* initialize the entity module */
        firm_init_entity();
-       /* allocate a hash table. */
-       init_type_identify(def_params.ti_if);
        /* class cast optimization */
        firm_init_class_casts_opt();
        /* memory disambiguation */
@@ -139,6 +140,8 @@ void ir_init(const firm_parameter_t *param)
        arch_dep_init(arch_dep_default_factory);
        arch_dep_set_opts(0);
 
+       init_irnode();
+
 #ifdef DEBUG_libfirm
        /* integrated debugger extension */
        firm_init_debugger();