X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=105296a7ff7190a2f86e4eb0ffd105aacd0418be;hb=6f167fe94cbbd6ca72afbef96cb57fe7c14aad5e;hp=10646d091355d57097681b4049675f5c98c4573d;hpb=049e7746fb729a28e90e69f02899c76c7b98b275;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 10646d091..105296a7f 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -23,16 +23,12 @@
  * @author    Martin Trapp, Christian Schaefer, Goetz Lindenmaier
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_FIRM_REVISION_H
 # include "firm_revision.h"
 #endif
 
-#include "firm_config.h"
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -55,25 +51,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"
 
 /* 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;
 }
 
 void firm_init_options(const char *arg_prefix, int argc, const char **argv) {
-	/* parse any init files for firm */
-	lc_opts_init("firm", firm_opt_get_root(), arg_prefix, argc, argv);
+	/* parse commandline */
+	lc_opt_from_argv(firm_opt_get_root(), arg_prefix, argc, argv, NULL);
 }
 
 void init_firm(const firm_parameter_t *param)
@@ -81,6 +82,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) {
@@ -107,7 +111,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 */
@@ -121,11 +125,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();
@@ -135,6 +143,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);
@@ -161,13 +173,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. */