X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=d1ce4d61036c453a3807e878190591a26c32a533;hb=0cc8bfc863da28d3799e9eca1d1765d564b6e573;hp=378f7dc993d66d52d51fc49a99e87a577094e9ed;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 378f7dc99..d1ce4d610 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -40,9 +40,7 @@
 # include <stdio.h>
 #endif
 
-#ifdef WITH_LIBCORE
-# include <libcore/lc_opts.h>
-#endif
+#include "lc_opts.h"
 
 #include "ident_t.h"
 #include "firm.h"
@@ -57,33 +55,30 @@
 #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 "debugger.h"
+#include "be_t.h"
 
-#ifdef WITH_LIBCORE
 /* returns the firm root */
 lc_opt_entry_t *firm_opt_get_root(void) {
 	static lc_opt_entry_t *grp = NULL;
-	if(!grp)
+	if (!grp)
 		grp = lc_opt_get_grp(lc_opt_root_grp(), "firm");
 	return grp;
 }
-#endif
 
 void firm_init_options(const char *arg_prefix, int argc, const char **argv) {
-#ifdef LIBCORE
 	/* parse any init files for firm */
 	lc_opts_init("firm", firm_opt_get_root(), arg_prefix, argc, argv);
-#else
-	(void) arg_prefix;
-	(void) argc;
-	(void) argv;
-#endif
 }
 
 void init_firm(const firm_parameter_t *param)
@@ -91,6 +86,9 @@ void init_firm(const firm_parameter_t *param)
 	firm_parameter_t def_params;
 	unsigned int     size;
 
+	/* for historical reasons be_init must be run first */
+	firm_be_init();
+
 	memset(&def_params, 0, sizeof(def_params));
 
 	if (param) {
@@ -117,7 +115,7 @@ void init_firm(const firm_parameter_t *param)
 	/* create the type kinds. */
 	init_tpop();
 	/* create an obstack and put all tarvals in a pdeq */
-	init_tarval_1(0l);
+	init_tarval_1(0l, /* support_quad_precision */0);
 	/* Builds a basic program representation, so modes can be added. */
 	init_irprog_1();
 	/* initialize all modes an ir node can consist of */
@@ -131,11 +129,15 @@ void init_firm(const firm_parameter_t *param)
 	/* 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);
+	firm_init_cons(def_params.initialize_local_func);
 	/* initialize reassociation */
 	firm_init_reassociation();
 	/* initialize function call optimization */
 	firm_init_funccalls();
+	/* initialize function inlining */
+	firm_init_inline();
+	/* initialize scalar replacement */
+	firm_init_scalar_replace();
 	/* Builds a construct allowing to access all information to be constructed
 	   later. */
 	init_irprog_2();
@@ -145,6 +147,10 @@ void init_firm(const firm_parameter_t *param)
 	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();
 
 	/* Init architecture dependent optimizations. */
 	arch_dep_init(arch_dep_default_factory);
@@ -171,13 +177,14 @@ void free_firm(void) {
 	for (i = get_irp_n_types() - 1; i >= 0; --i)
 		free_type(get_irp_type(i));
 
-	finish_op();
 	free_ir_prog();
 
 	finish_tarval();
 	finish_mode();
 	finish_tpop();
 	finish_ident();
+
+	firm_be_finish();
 }
 
 /* Returns the libFirm version number. */