we always compile with C99 support now

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index cc2d3c0..df3ef9c 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -24,7 +24,9 @@
  */
 #include "config.h"
 
-#include "firm_revision.h"
+#ifdef HAVE_FIRM_REVISION_H
+# include "firm_revision.h"
+#endif
 
 #include <string.h>
 #include <stdio.h>
@@ -52,6 +54,8 @@
 #include "debugger.h"
 #include "be_t.h"
 #include "irtools.h"
+#include "execfreq_t.h"
+#include "firmstat_t.h"
 
 /* returns the firm root */
 lc_opt_entry_t *firm_opt_get_root(void)
@@ -83,12 +87,12 @@ void ir_init(void)
        init_mode();
        /* initialize tarvals, and floating point arithmetic */
        init_tarval_2();
+       /* initialize node opcodes */
+       firm_init_op();
        /* init graph construction */
        firm_init_irgraph();
        /* kind of obstack initialization */
        firm_init_mangle();
-       /* initialize all op codes an irnode can consist of */
-       init_op();
        /* initialize reassociation */
        firm_init_reassociation();
        /* initialize function call optimization */
@@ -100,10 +104,6 @@ void ir_init(void)
        /* Builds a construct allowing to access all information to be constructed
           later. */
        init_irprog_2();
-       /* Initialize the type module and construct some idents needed. */
-       ir_init_type();
-       /* initialize the entity module */
-       ir_init_entity();
        /* class cast optimization */
        firm_init_class_casts_opt();
        /* memory disambiguation */
@@ -113,7 +113,9 @@ void ir_init(void)
        /* Init architecture dependent optimizations. */
        arch_dep_set_opts(arch_dep_none);
 
-       init_irnode();
+       init_execfreq();
+
+       init_stat();
 
 #ifdef DEBUG_libfirm
        /* integrated debugger extension */
@@ -123,31 +125,19 @@ void ir_init(void)
 
 void ir_finish(void)
 {
-       size_t i;
-
-       /* must iterate backwards here */
-       for (i = get_irp_n_irgs(); i > 0;)
-               free_ir_graph(get_irp_irg(--i));
-
-       free_type_entities(get_glob_type());
-       /* must iterate backwards here */
-       for (i = get_irp_n_types(); i > 0;)
-               free_type_entities(get_irp_type(--i));
-
-       for (i = get_irp_n_types(); i > 0;)
-               free_type(get_irp_type(--i));
+#ifdef DEBUG_libfirm
+       firm_finish_debugger();
+#endif
+       exit_execfreq();
+       firm_be_finish();
 
        free_ir_prog();
-
-       ir_finish_entity();
-       ir_finish_type();
-
+       firm_finish_op();
        finish_tarval();
        finish_mode();
        finish_tpop();
+       firm_finish_mangle();
        finish_ident();
-
-       firm_be_finish();
 }
 
 unsigned ir_get_version_major(void)