I was annoyed by the compiler warnings about implicit conversions.

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index e1f4904..3d6c417 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -47,28 +47,25 @@
 #include "irgraph_t.h"
 #include "type_t.h"
 #include "entity_t.h"
-#include "opt_inline_t.h"
-#include "scalar_replace.h"
 #include "firmstat.h"
 #include "irarch.h"
-#include "reassoc_t.h"
-#include "funccall_t.h"
 #include "irhooks.h"
 #include "iredges_t.h"
 #include "irmemory_t.h"
-#include "tropt.h"
+#include "opt_init.h"
 #include "debugger.h"
 #include "be_t.h"
 
 /* returns the firm root */
-lc_opt_entry_t *firm_opt_get_root(void) {
+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;
 }
 
-void init_firm(const firm_parameter_t *param)
+void ir_init(const firm_parameter_t *param)
 {
        firm_parameter_t def_params;
        unsigned int     size;
@@ -93,8 +90,6 @@ void init_firm(const firm_parameter_t *param)
        firm_init_flags();
        /* initialize all ident stuff */
        init_ident(def_params.id_if, 1024);
-       /* initialize Firm hooks */
-       firm_init_hooks();
        /* enhanced statistics, need idents and hooks */
        firm_init_stat(def_params.enable_statistics);
        /* Edges need hooks. */
@@ -132,12 +127,11 @@ void init_firm(const firm_parameter_t *param)
        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);
        /* class cast optimization */
        firm_init_class_casts_opt();
        /* memory disambiguation */
        firm_init_memory_disambiguator();
+       firm_init_loop_opt();
 
        /* Init architecture dependent optimizations. */
        arch_dep_init(arch_dep_default_factory);
@@ -149,7 +143,8 @@ void init_firm(const firm_parameter_t *param)
 #endif
 }
 
-void free_firm(void) {
+void ir_finish(void)
+{
        int i;
 
        for (i = get_irp_n_irgs() - 1; i >= 0; --i)
@@ -174,17 +169,17 @@ void free_firm(void) {
        firm_be_finish();
 }
 
-unsigned firm_get_version_major(void)
+unsigned ir_get_version_major(void)
 {
        return libfirm_VERSION_MAJOR;
 }
 
-unsigned firm_get_version_minor(void)
+unsigned ir_get_version_minor(void)
 {
        return libfirm_VERSION_MINOR;
 }
 
-const char *firm_get_version_revision(void)
+const char *ir_get_version_revision(void)
 {
 #ifdef libfirm_VERSION_REVISION
        return libfirm_VERSION_REVISION;
@@ -193,7 +188,7 @@ const char *firm_get_version_revision(void)
 #endif
 }
 
-const char *firm_get_version_build(void)
+const char *ir_get_version_build(void)
 {
        return "";
 }