updated

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 42617a9..b9d4ca0 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,6 +27,12 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_FIRM_REVISION_H
+# include "firm_revision.h"
+#endif
+
+#include "firm_config.h"
+
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -34,14 +40,11 @@
 # include <stdio.h>
 #endif
 
-#ifdef WITH_LIBCORE
-# include <libcore/lc_opts.h>
-#endif
+#include "lc_opts.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"
@@ -52,16 +55,14 @@
 #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 "funccall_t.h"
 #include "irhooks.h"
 #include "iredges_t.h"
 #include "debugger.h"
 
-#ifdef WITH_LIBCORE
 /* returns the firm root */
 lc_opt_entry_t *firm_opt_get_root(void) {
        static lc_opt_entry_t *grp = NULL;
@@ -74,7 +75,6 @@ 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)
 {
@@ -121,24 +121,24 @@ void init_firm(const firm_parameter_t *param)
        /* initialize all op codes an irnode can consist of */
        init_op();
        /* called once for each run of this library */
-       init_cons(def_params.initialize_local_func);
+       firm_init_cons(def_params.initialize_local_func);
        /* initialize reassociation */
        firm_init_reassociation();
+       /* initialize function call optimization */
+       firm_init_funccalls();
        /* Builds a construct allowing to access all information to be constructed
           later. */
        init_irprog_2();
-       /* Initialize the type module ancd cr   d construct some idents needed. */
+       /* Initialize the type module and construct some idents needed. */
        firm_init_type(def_params.builtin_dbg, def_params.cc_mask);
        /* initialize the entity module */
        firm_init_entity();
        /* allocate a hash table. */
        init_type_identify(def_params.ti_if);
-       /* Init reflection facility. */
-       firm_init_rflct();
 
        /* Init architecture dependent optimizations. */
        arch_dep_init(arch_dep_default_factory);
-       arch_dep_set_opts(arch_dep_mul_to_shift | arch_dep_div_by_const | arch_dep_mod_by_const);
+       arch_dep_set_opts(0);
 
        firm_archops_init(def_params.arch_op_settings);
 
@@ -172,6 +172,12 @@ void free_firm(void) {
 
 /* Returns the libFirm version number. */
 void firm_get_version(firm_version_t *version) {
-       version->major = libFirm_VERSION_MAJOR;
-       version->minor = libFirm_VERSION_MINOR;
+       version->major    = libfirm_VERSION_MAJOR;
+       version->minor    = libfirm_VERSION_MINOR;
+#ifdef libfirm_VERSION_REVISION
+       version->revision = libfirm_VERSION_REVISION;
+#else
+       version->revision = "";
+#endif
+       version->build    = "";
 }