X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirm.h;h=1cb680729a01d23cb4f6902d6e8ce9d99ac1aaf6;hb=6c1a97fd2c011beb75d9ae7f0746dd6bd22ce064;hp=1532158ab22d95689485eca4aa146e9a03420b85;hpb=867ed2f22a1063f47f8a23afcf1d0f6b905ed514;p=libfirm

diff --git a/ir/common/firm.h b/ir/common/firm.h
index 1532158ab..1cb680729 100644
--- a/ir/common/firm.h
+++ b/ir/common/firm.h
@@ -56,6 +56,7 @@ extern "C" {
 /* The representations */
 #include "firm_common.h"   /* common type tags. */
 #include "irprog.h"        /* control flow and data of a program */
+#include "irgraph.h"       /* graphs */
 #include "type.h"          /* type representation */
 #include "entity.h"        /* entity representation */
 #include "tv.h"            /* target values */
@@ -73,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 */
@@ -81,7 +83,15 @@ extern "C" {
 #include "scalar_replace.h" /* Scalar replacement */
 #include "proc_cloning.h"   /* procedure cloning */
 #include "opt_confirms.h"   /* Confirm based optimizations */
-//#include "opt_branches.h"   /* Branch 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. */
@@ -93,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"
@@ -115,6 +126,7 @@ extern "C" {
 #include "irreflect.h"     /* reflection */
 
 #include "seqnumbers.h"    /* debug support */
+#include "firm_ycomp.h"    /* ycomp debugging support */
 
 
 /* @@@ temporarily for jni builder until preprocessor works.
@@ -176,7 +188,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.
@@ -187,35 +199,21 @@ 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 1
+#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.
  *
@@ -234,6 +232,19 @@ 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 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