X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.c;h=f3809c68830cb47ec0e7ddb8e6e0e5dff7c06a75;hb=51eff1cc020af2ed56d9ea226fe20faf801cac5b;hp=4c35d24d61549a15460e422bfdfba8f3be9bd530;hpb=5d7a456481835b991a45c8035f9dfcf0c87e0d61;p=libfirm

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 4c35d24d6..f3809c688 100644
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -9,7 +9,6 @@
  * Copyright:   (c) 1998-2003 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -17,37 +16,39 @@
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
-
+#ifdef HAVE_STDIO_H
 # include <stdio.h>
+#endif
 
 #ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
+# include <libcore/lc_opts.h>
 #endif
 
-# include "ident_t.h"
-# include "firm.h"
-# include "irflag_t.h"
-# include "mangle.h"
+#include "ident_t.h"
+#include "firm.h"
+#include "irflag_t.h"
+#include "mangle.h"
 /* init functions are not public */
-# include "tv_t.h"
-# include "tpop_t.h"
-# include "irprog_t.h"
-# include "irnode_t.h"
-# include "irmode_t.h"
-# 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"
-# include "irarch.h"
-# include "reassoc_t.h"
-# include "irhooks.h"
-# include "iredges_t.h"
-# include "debugger.h"
+#include "tv_t.h"
+#include "tpop_t.h"
+#include "irprog_t.h"
+#include "irnode_t.h"
+#include "irmode_t.h"
+#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"
+#include "irarch.h"
+#include "reassoc_t.h"
+#include "irhooks.h"
+#include "iredges_t.h"
+#include "debugger.h"
 
 #ifdef WITH_LIBCORE
+/* returns the firm root */
 lc_opt_entry_t *firm_opt_get_root(void)
 {
 	static lc_opt_entry_t *grp = NULL;
@@ -81,9 +82,9 @@ init_firm(const firm_parameter_t *param)
   /* 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. */
@@ -109,7 +110,7 @@ init_firm(const firm_parameter_t *param)
   /* Builds a construct allowing to access all information to be constructed
      later. */
   init_irprog_2();
-  /* Initialize the type module and construct some idents needed. */
+  /* Initialize the type module ancd cr	d construct some idents needed. */
   firm_init_type(def_params.builtin_dbg, def_params.cc_mask);
   /* initialize the entity module */
   firm_init_entity();
@@ -130,19 +131,8 @@ init_firm(const firm_parameter_t *param)
 #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);
-
+  /* parse any init files for firm */
+  lc_opts_init("firm", firm_opt_get_root(), def_params.arg_prefix, def_params.argc, def_params.argv);
 #endif
 }
 
@@ -159,10 +149,10 @@ 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();