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

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 2456fe076..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"
@@ -39,6 +45,17 @@
 # include "reassoc_t.h"
 # include "irhooks.h"
 # 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)
@@ -49,7 +66,7 @@ init_firm(const firm_parameter_t *param)
   memset(&def_params, 0, sizeof(def_params));
 
   if (param) {
-    /* check for reasonale size */
+    /* check for reasonable size */
     assert(param->size <= sizeof(def_params) && (param->size & 3) == 0 &&
 	   "parameter struct not initialized ???");
     size = sizeof(def_params);
@@ -59,28 +76,31 @@ 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 */
   init_mode();
   /* initialize tarvals, and floating point arithmetic */
   init_tarval_2();
   /* init graph construction */
-  init_irgraph();
+  firm_init_irgraph();
   /* kind of obstack initialization */
   firm_init_mangle();
-  /* initalize all op codes an irnode can consist of */
+  /* 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);
@@ -88,10 +108,11 @@ init_firm(const firm_parameter_t *param)
   firm_init_reassociation();
   /* Builds a construct allowing to access all information to be constructed
      later. */
-  init_irprog();
-  /* Constructs some idents needed. */
-  init_type();
-  init_entity();
+  init_irprog_2();
+  /* 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. */
@@ -102,26 +123,53 @@ init_firm(const firm_parameter_t *param)
   arch_dep_set_opts(arch_dep_mul_to_shift | arch_dep_div_by_const | arch_dep_mod_by_const);
 
   firm_archops_init(def_params.arch_op_settings);
-}
 
+#ifndef NDEBUG
+  /* 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;
 
-  for (i = 0; i < get_irp_n_irgs(); i++)
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
     free_ir_graph(get_irp_irg(i));
 
-  for (i = 0; i < get_irp_n_types(); i++) {
+  free_type_entities(get_glob_type());
+  for (i = get_irp_n_types() - 1; i >= 0; --i)
     free_type_entities(get_irp_type(i));
+
+  for (i = get_irp_n_types() - 1; i >= 0; --i)
     free_type(get_irp_type(i));
-  }
 
-  free_type_entities(get_glob_type());
+  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;
+}