X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=75360cb4f5f52f33555b404bfc052b1900bc999b;hb=9b0957659c22d223a11d75df3df3478b188850e2;hp=a680ec774b54df33392729a11ed640ab91476efc;hpb=4706923c2f0d9c18b80d09e1498ae896544b91c3;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index a680ec774..75360cb4f 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -20,8 +20,13 @@
 
 # include <stdio.h>
 
+#ifdef WITH_LIBCORE
+#include <libcore/lc_opts.h>
+#endif
+
 # include "ident_t.h"
 # include "firm.h"
+# include "irflag_t.h"
 # include "mangle.h"
 /* init functions are not public */
 # include "tv_t.h"
@@ -32,6 +37,7 @@
 # include "ircons_t.h"
 # include "irgraph_t.h"
 # include "type_t.h"
+# include "entity_t.h"
 # include "type_identify.h"
 # include "firmstat.h"
 # include "irreflect_t.h"
@@ -41,6 +47,16 @@
 # include "iredges_t.h"
 # include "debugger.h"
 
+#ifdef WITH_LIBCORE
+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;
+}
+#endif
+
 void
 init_firm(const firm_parameter_t *param)
 {
@@ -60,19 +76,20 @@ init_firm(const firm_parameter_t *param)
     memcpy(&def_params, param, size);
   }
 
-
+	/* initialize firm flags */
+	firm_init_flags();
   /* initialize all ident stuff */
   init_ident(def_params.id_if, 1024);
   /* initialize Firm hooks */
-  init_hooks();
+  firm_init_hooks();
   /* enhanced statistics, need idents and hooks */
-  init_stat(def_params.enable_statistics);
+  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();
+  init_tarval_1(0l);
   /* Builds a basic program representation, so modes can be added. */
   init_irprog_1();
   /* initialize all modes an ir node can consist of */
@@ -80,7 +97,7 @@ init_firm(const firm_parameter_t *param)
   /* initialize tarvals, and floating point arithmetic */
   init_tarval_2();
   /* init graph construction */
-  init_irgraph();
+  firm_init_irgraph();
   /* kind of obstack initialization */
   firm_init_mangle();
   /* initialize all op codes an irnode can consist of */
@@ -92,9 +109,10 @@ init_firm(const firm_parameter_t *param)
   /* Builds a construct allowing to access all information to be constructed
      later. */
   init_irprog_2();
-  /* Constructs some idents needed. */
-  firm_init_type(NULL);
-  init_entity();
+  /* Initialize the type module and construct some idents needed. */
+  firm_init_type(def_params.builtin_dbg, def_params.cc_mask);
+  /* initialize the entity module */
+  firm_init_entity();
   /* allocate a hash table. */
   init_type_identify(def_params.ti_if);
   /* Init reflection facility. */
@@ -110,8 +128,23 @@ init_firm(const firm_parameter_t *param)
   /* integrated debugger extension */
   firm_init_debugger();
 #endif
-}
 
+#ifdef WITH_LIBCORE
+	/* Process command line and ini file. */
+
+	if(def_params.ini_file) {
+		FILE *f = fopen(def_params.ini_file, "rt");
+		if(f) {
+			lc_opt_from_file(def_params.ini_file, f, NULL);
+			fclose(f);
+		}
+	}
+
+	lc_opt_from_argv(firm_opt_get_root(), def_params.arg_prefix,
+			def_params.argc, def_params.argv, NULL);
+
+#endif
+}
 
 void free_firm(void) {
   int i;
@@ -126,11 +159,17 @@ 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_op();
   finish_mode();
   finish_tpop();
   finish_ident();
 }
+
+/* Returns the libFirm version number. */
+void firm_get_version(firm_version_t *version) {
+  version->major = libFirm_VERSION_MAJOR;
+  version->minor = libFirm_VERSION_MINOR;
+}