cleaned up the order of ifdef's

[libfirm] / ir / common / firm.h

diff --git a/ir/common/firm.h b/ir/common/firm.h
index 03ec514..e8d3217 100644 (file)
--- a/ir/common/firm.h
+++ b/ir/common/firm.h
@@ -80,7 +80,13 @@ extern "C" {
 #include "return.h"         /* Return node normalizations */
 #include "scalar_replace.h" /* Scalar replacement */
 #include "proc_cloning.h"   /* procedure cloning */
-//#include "opt_branches.h"   /* Branch optimizations */
+#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 */
+
+/* Lowering */
+#include "lower_calls.h"      /* lowering of different calls */
+#include "lower_intrinsics.h" /* lowering of intrinsic calls */
 
 /* Analyses */
 #include "irouts.h"         /* Graph reversal / out edges. */
@@ -186,10 +192,46 @@ 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;
 
+#define libFirm_VERSION_MAJOR 0
+#define libFirm_VERSION_MINOR 4
+
+/**
+ * The Firm version number.
+ */
+typedef struct _firm_version_t {
+  unsigned major;
+  unsigned minor;
+} firm_version_t;
+
 /**
  * Initialize the firm library.
  *
@@ -208,6 +250,12 @@ void init_firm(const firm_parameter_t *params);
  */
 void free_firm(void);
 
+/**
+ * Returns the libFirm version number.
+ * If statically linked, always libFirm_VERSION_MAJOR, libFirm_VERSION_MINOR
+ */
+void firm_get_version(firm_version_t *version);
+
 #ifdef __cplusplus
 }
 #endif