X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=553b3058fd9195499fb49c7ca0c8affb98b864c9;hb=e88385016800d3c56c3fa09770e9f7995c42e106;hp=7ebdf3ee007493c3a406724bbcc87a132d16e65e;hpb=795490b811a500c73a408d3e5bf68fdeaa8a15ae;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 7ebdf3ee0..553b3058f 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -23,29 +23,20 @@
  * @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
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
-#endif
+#include <string.h>
+#include <stdio.h>
 
 #include "lc_opts.h"
 
 #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,32 +46,26 @@
 #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 "irmemory_t.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");
 	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);
-}
-
-void init_firm(const firm_parameter_t *param)
+void ir_init(const firm_parameter_t *param)
 {
 	firm_parameter_t def_params;
 	unsigned int     size;
@@ -104,17 +89,16 @@ void init_firm(const firm_parameter_t *param)
 	/* initialize firm flags */
 	firm_init_flags();
 	/* initialize all ident stuff */
-	init_ident(def_params.id_if, 1024);
-	/* initialize Firm hooks */
-	firm_init_hooks();
+	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. */
 	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 */
@@ -128,7 +112,9 @@ 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 */
-	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 */
@@ -141,19 +127,19 @@ void init_firm(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);
+	ir_init_type();
 	/* initialize the entity module */
-	firm_init_entity();
-	/* allocate a hash table. */
-	init_type_identify(def_params.ti_if);
+	ir_init_entity();
 	/* 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);
+	arch_dep_set_opts(arch_dep_none);
 
-	firm_archops_init(def_params.arch_op_settings);
+	init_irnode();
 
 #ifdef DEBUG_libfirm
 	/* integrated debugger extension */
@@ -161,7 +147,8 @@ void init_firm(const firm_parameter_t *param)
 #endif
 }
 
-void free_firm(void) {
+void ir_finish(void)
+{
 	int i;
 
 	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
@@ -176,6 +163,9 @@ void free_firm(void) {
 
 	free_ir_prog();
 
+	ir_finish_entity();
+	ir_finish_type();
+
 	finish_tarval();
 	finish_mode();
 	finish_tpop();
@@ -184,14 +174,26 @@ void free_firm(void) {
 	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;
+unsigned ir_get_version_major(void)
+{
+	return libfirm_VERSION_MAJOR;
+}
+
+unsigned ir_get_version_minor(void)
+{
+	return libfirm_VERSION_MINOR;
+}
+
+const char *ir_get_version_revision(void)
+{
 #ifdef libfirm_VERSION_REVISION
-	version->revision = libfirm_VERSION_REVISION;
+	return libfirm_VERSION_REVISION;
 #else
-	version->revision = "";
+	return "";
 #endif
-	version->build    = "";
+}
+
+const char *ir_get_version_build(void)
+{
+	return "";
 }