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

[libfirm] / ir / common / firm.h

diff --git a/ir/common/firm.h b/ir/common/firm.h
index c09faf1..f3cc21a 100644 (file)
--- a/ir/common/firm.h
+++ b/ir/common/firm.h
@@ -74,7 +74,8 @@ extern "C" {
 #include "cfopt.h"          /* optimize control flow */
 #include "tailrec.h"        /* optimize tail-recursion calls */
 #include "ircgopt.h"        /* Optimizations based on interprocedural graph */
-#include "strength_red.h"   /* Strength reduction */
+#include "opt_osr.h"        /* Operator Strength Reduction */
+#include "strength_red.h"   /* Old (and buggy) Strength reduction */
 #include "loop_unrolling.h" /* Do loop unrolling */
 #include "ifconv.h"         /* if conversion */
 #include "funccall.h"       /* real function call optimization */
@@ -84,10 +85,13 @@ extern "C" {
 #include "opt_confirms.h"   /* Confirm based optimizations */
 #include "gvn_pre.h"        /* global value numbering and partial redundancy elimination */
 #include "opt_frame.h"      /* frame type optimization */
+#include "tropt.h"          /* optimize the type representation */
+#include "condeval.h"       /* control flow optimization by conditional evaluation */
 
 /* Lowering */
 #include "lower_calls.h"      /* lowering of different calls */
 #include "lower_intrinsics.h" /* lowering of intrinsic calls */
+#include "lower_dw.h"         /* double word types lowering */
 
 /* Analyses */
 #include "irouts.h"         /* Graph reversal / out edges. */
@@ -99,6 +103,7 @@ extern "C" {
 #include "callgraph.h"      /* Callgraph construction */
 #include "irconsconfirm.h"  /* Confirm nodes */
 #include "analyze_irg_args.h" /* Simple pointer parameter analysis */
+#include "irtypeinfo.h"       /* type information for nodes */
 #include "interval_analysis.h"
 #include "field_temperature.h"
 #include "execution_frequency.h"
@@ -182,7 +187,7 @@ struct _firm_parameter_t {
    * The architecture dependent opcode settings.
    * If not set, no architecture dependent operations will be used.
    */
-  arch_ops_info *arch_op_settings;
+  const arch_ops_info *arch_op_settings;
 
   /**
    * The default calling convention.
@@ -193,31 +198,6 @@ struct _firm_parameter_t {
    * The debug info that should be used for "builtin" objects.
    */
   dbg_info *builtin_dbg;
-
-       /**
-        * Prefix for the command line options.
-        * example: if the option is -ffirm-opt-bla, then the prefix is "-f"
-        * @note Only active, if libfirm is compiled with libcore.
-        */
-       const char *arg_prefix;
-
-       /**
-        * Number of arguments in the "command line".
-        * @note Only active, if libfirm is compiled with libcore.
-        */
-       int argc;
-
-       /**
-        * Array of arguments.
-        * @note Only active, if libfirm is compiled with libcore.
-        */
-       const char **argv;
-
-       /**
-        * Name of ini file which is initially read.
-        * @note Only active, if libfirm is compiled with libcore.
-        */
-       const char *ini_file;
 };
 
 typedef struct _firm_parameter_t firm_parameter_t;
@@ -257,6 +237,13 @@ void free_firm(void);
  */
 void firm_get_version(firm_version_t *version);
 
+#ifdef WITH_LIBCORE
+/**
+ * Read initializations arguments from the .init file.
+ */
+void firm_init_options(const char *arg_prefix, int argc, const char **argv);
+#endif
+
 #ifdef __cplusplus
 }
 #endif