X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=e35f9cb9cd072ec039842713a0b6a2b8fc8bedb9;hb=4d6c06673e8fc5d144bfe16397697ff2812fc22e;hp=168a592e9f8e6db3a6ddc2904d35656938de28b9;hpb=e98f25e8d5846ba4e1382c6fa47a3e50b763cf5f;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 168a592e9..e35f9cb9c 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -29,19 +29,14 @@
 # include "firm_revision.h"
 #endif
 
-#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"
@@ -51,33 +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 "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");
 	return grp;
 }
 
-void firm_init_options(const char *arg_prefix, int argc, const char **argv) {
-	/* parse commandline */
-	lc_opt_from_argv(firm_opt_get_root(), arg_prefix, argc, argv, NULL);
-}
-
-void init_firm(const firm_parameter_t *param)
+void ir_init(const firm_parameter_t *param)
 {
 	firm_parameter_t def_params;
 	unsigned int     size;
@@ -101,11 +89,10 @@ 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. */
@@ -125,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 */
@@ -138,27 +127,29 @@ 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);
+	firm_init_type();
 	/* 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();
 #endif
 }
 
-void free_firm(void) {
+void ir_finish(void)
+{
 	int i;
 
 	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
@@ -183,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 "";
 }