firm_init_options() is now a separate function that reads the firm.ini and might...

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 0f530bf..34417e2 100644 (file)
--- 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,45 +16,51 @@
 #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
-lc_opt_entry_t *firm_opt_get_root(void)
-{
+/* returns the firm root */
+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 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);
+}
+#endif /* WITH_LIBCORE */
 
 void
 init_firm(const firm_parameter_t *param)
@@ -76,14 +81,14 @@ init_firm(const firm_parameter_t *param)
     memcpy(&def_params, param, size);
   }
 
-       /* initialize firm flags */
-       firm_init_flags();
+  /* 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. */
@@ -109,7 +114,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();
@@ -128,22 +133,6 @@ 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) {