typo fixed

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 21d9747..75360cb 100644 (file)
--- 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"
@@ -42,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)
 {
@@ -61,18 +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 */
@@ -111,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;
@@ -127,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;
+}