X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=97569391f924109e5a94c225b7fb21ced9c593a2;hb=0d61f4e9a295d71deca66e1580273e484e7f0f9f;hp=5c40fc919aa32a6c465d3f6e6eb94a192b9dd585;hpb=df554af94dd1266461cd1b6754005b39e163c04c;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 5c40fc919..97569391f 100644
--- 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"
@@ -47,21 +46,19 @@
 #include "irgraph_t.h"
 #include "type_t.h"
 #include "entity_t.h"
-#include "opt_inline_t.h"
-#include "scalar_replace.h"
 #include "firmstat.h"
 #include "irarch.h"
-#include "reassoc_t.h"
-#include "funccall_t.h"
 #include "irhooks.h"
 #include "iredges_t.h"
 #include "irmemory_t.h"
-#include "tropt.h"
+#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) {
+lc_opt_entry_t *firm_opt_get_root(void)
+{
 	static lc_opt_entry_t *grp = NULL;
 	if (!grp)
 		grp = lc_opt_get_grp(lc_opt_root_grp(), "firm");
@@ -93,8 +90,6 @@ void ir_init(const firm_parameter_t *param)
 	firm_init_flags();
 	/* initialize all ident stuff */
 	init_ident(def_params.id_if, 1024);
-	/* initialize Firm hooks */
-	firm_init_hooks();
 	/* enhanced statistics, need idents and hooks */
 	firm_init_stat(def_params.enable_statistics);
 	/* Edges need hooks. */
@@ -129,20 +124,21 @@ 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(def_params.cc_mask);
 	/* 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 */
 	firm_init_memory_disambiguator();
+	firm_init_loop_opt();
 
 	/* Init architecture dependent optimizations. */
 	arch_dep_init(arch_dep_default_factory);
 	arch_dep_set_opts(0);
 
+	init_irnode();
+
 #ifdef DEBUG_libfirm
 	/* integrated debugger extension */
 	firm_init_debugger();