X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=7ebdf3ee007493c3a406724bbcc87a132d16e65e;hb=d44b3844af84684de9b0213b77c175f80f8b84ee;hp=60fd375f605327d83583d96488aabe0df8f7f1d1;hpb=92869d69702fc0fd8e77832b9b68c60cb0d3e82a;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 60fd375f6..7ebdf3ee0 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,6 +27,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_FIRM_REVISION_H
+# include "firm_revision.h"
+#endif
+
 #include "firm_config.h"
 
 #ifdef HAVE_STRING_H
@@ -36,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"
@@ -53,18 +55,22 @@
 #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 "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;
 }
@@ -73,13 +79,15 @@ 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);
 }
-#endif /* WITH_LIBCORE */
 
 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) {
@@ -120,9 +128,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();
@@ -132,10 +146,12 @@ 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();
 
 	/* 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);
+	arch_dep_set_opts(0);
 
 	firm_archops_init(def_params.arch_op_settings);
 
@@ -158,19 +174,24 @@ 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. */
 void firm_get_version(firm_version_t *version) {
-	version->major = libfirm_VERSION_MAJOR;
-	version->minor = libfirm_VERSION_MINOR;
-	version->micro = libfirm_VERSION_MICRO;
-	version->build = 0;
+	version->major    = libfirm_VERSION_MAJOR;
+	version->minor    = libfirm_VERSION_MINOR;
+#ifdef libfirm_VERSION_REVISION
+	version->revision = libfirm_VERSION_REVISION;
+#else
+	version->revision = "";
+#endif
+	version->build    = "";
 }