removed useless includes

[r13572]

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index b936c60..74187b7 100644 (file)
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -37,9 +37,11 @@
 
 #include "iredges.h"
 #include "irgwalk.h"
+#include "irnode_t.h"
 #include "irgraph_t.h"
 #include "irloop.h"
 #include "irprintf.h"
+#include "execfreq.h"
 #include "irdump_t.h"
 #include "irtools.h"
 #include "debug.h"

diff --git a/ir/be/beblocksched.h b/ir/be/beblocksched.h
index 998488c..d5df0d0 100644 (file)
--- a/ir/be/beblocksched.h
+++ b/ir/be/beblocksched.h
@@ -27,9 +27,7 @@
 #ifndef FIRM_BE_BEBLOCKSCHED_H
 #define FIRM_BE_BEBLOCKSCHED_H
 
-#include "execfreq.h"
-#include "irnode.h"
-#include "irgraph.h"
+#include "firm_types.h"
 
 ir_node **be_create_block_schedule(ir_graph *irg, ir_exec_freq *execfreqs);
 

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 1dfd665..b566cec 100644 (file)
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -27,9 +27,9 @@
 #ifndef FIRM_BE_BECHORDAL_T_H
 #define FIRM_BE_BECHORDAL_T_H
 
+#include "firm_types.h"
 #include "list.h"
 #include "pmap.h"
-#include "irnode.h"
 #include "bitset.h"
 #include "obst.h"
 #include "debug.h"

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 0bd2894..1212fb6 100644 (file)
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -28,8 +28,7 @@
 #define FIRM_BE_BECOPYILP_T_H
 
 #include "firm_config.h"
-
-#include "irnode.h"
+#include "firm_types.h"
 #include "pset.h"
 #include "becopyopt_t.h"
 

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index 8464541..76031dc 100644 (file)
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -38,6 +38,7 @@
 #include "debug.h"
 #include "pmap.h"
 #include "raw_bitset.h"
+#include "irnode.h"
 #include "irgraph.h"
 #include "irgwalk.h"
 #include "irprog.h"

diff --git a/ir/be/becopyopt.h b/ir/be/becopyopt.h
index fb2b055..79b9924 100644 (file)
--- a/ir/be/becopyopt.h
+++ b/ir/be/becopyopt.h
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 
-#include "irnode.h"
+#include "firm_types.h"
 #include "bechordal.h"
 
 /**

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 1f7f657..f63541e 100644 (file)
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -372,7 +372,7 @@ void copystat_dump(ir_graph *irg) {
 
        snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
        buf[sizeof(buf) - 1] = '\0';
-       out = ffopen(buf, "stat", "wt");
+       out = be_ffopen(buf, "stat", "wt");
 
        fprintf(out, "%d\n", ASIZE);
        for (i = 0; i < ASIZE; i++) {
@@ -396,7 +396,7 @@ void copystat_dump_pretty(ir_graph *irg) {
 
        snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
        buf[sizeof(buf) - 1] = '\0';
-       out = ffopen(buf, "pstat", "wt");
+       out = be_ffopen(buf, "pstat", "wt");
 
        fprintf(out, "Nodes     %4d\n", curr_vals[I_ALL_NODES]);
        fprintf(out, "Blocks    %4d\n", curr_vals[I_BLOCKS]);

diff --git a/ir/be/becopystat.h b/ir/be/becopystat.h
index 09a6127..35b2bd7 100644 (file)
--- a/ir/be/becopystat.h
+++ b/ir/be/becopystat.h
@@ -28,7 +28,7 @@
 #define FIRM_BE_BECOPYSTAT_H
 
 #include "firm_config.h"
-#include "irgraph.h"
+#include "firm_types.h"
 #include "bearch_t.h"
 #include "bechordal_t.h"
 

diff --git a/ir/be/bedomfront.h b/ir/be/bedomfront.h
index b012c96..eaa08f5 100644 (file)
--- a/ir/be/bedomfront.h
+++ b/ir/be/bedomfront.h
@@ -27,8 +27,7 @@
 #ifndef FIRM_BE_BEDOMFRONT_H
 #define FIRM_BE_BEDOMFRONT_H
 
-#include "irnode.h"
-#include "irgraph.h"
+#include "firm_types.h"
 
 /*
  * Forward type declaration.

diff --git a/ir/be/beemitter.h b/ir/be/beemitter.h
index 963278f..be964de 100644 (file)
--- a/ir/be/beemitter.h
+++ b/ir/be/beemitter.h
@@ -29,9 +29,8 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include "firm_types.h"
 #include "obst.h"
-#include "ident.h"
-#include "irnode.h"
 #include "be.h"
 
 /* framework for emitting data (usually the final assembly code) */

diff --git a/ir/be/beinsn_t.h b/ir/be/beinsn_t.h
index a2493b8..8fd828c 100644 (file)
--- a/ir/be/beinsn_t.h
+++ b/ir/be/beinsn_t.h
@@ -26,7 +26,7 @@
 #ifndef FIRM_BE_BEINSN_T_H
 #define FIRM_BE_BEINSN_T_H
 
-#include "irnode.h"
+#include "firm_types.h"
 #include "bitset.h"
 #include "obst.h"
 

diff --git a/ir/be/beirg.h b/ir/be/beirg.h
index d9759ed..b9813f0 100644 (file)
--- a/ir/be/beirg.h
+++ b/ir/be/beirg.h
@@ -27,7 +27,6 @@
 #ifndef FIRM_BE_BEIRG_H
 #define FIRM_BE_BEIRG_H
 
-#include "execfreq.h"
 #include "belive.h"
 #include "bedomfront.h"
 

diff --git a/ir/be/beirgmod.h b/ir/be/beirgmod.h
index bf1575e..54ccb46 100644 (file)
--- a/ir/be/beirgmod.h
+++ b/ir/be/beirgmod.h
@@ -32,7 +32,7 @@
 #ifndef FIRM_BE_BEIRGMOD_H
 #define FIRM_BE_BEIRGMOD_H
 
-#include "irnode.h"
+#include "firm_types.h"
 #include "beirg.h"
 
 /**

diff --git a/ir/be/belistsched.h b/ir/be/belistsched.h
index 564251a..496ff77 100644 (file)
--- a/ir/be/belistsched.h
+++ b/ir/be/belistsched.h
@@ -27,8 +27,7 @@
 #ifndef FIRM_BE_BELISTSCHED_H
 #define FIRM_BE_BELISTSCHED_H
 
-#include "irgraph.h"
-#include "irnode.h"
+#include "firm_types.h"
 #include "irnodeset.h"
 
 #include "be.h"

diff --git a/ir/be/belive.h b/ir/be/belive.h
index 5ec205e..39f0a7f 100644 (file)
--- a/ir/be/belive.h
+++ b/ir/be/belive.h
@@ -29,9 +29,8 @@
 
 #include <stdio.h>
 
+#include "firm_types.h"
 #include "pset.h"
-#include "irnode.h"
-#include "irgraph.h"
 
 #include "bearch.h"
 

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 3498419..a02a73c 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -97,6 +97,7 @@ typedef struct _perm_cycle_t {
        perm_type_t             type;        /**< type (CHAIN or CYCLE) */
 } perm_cycle_t;
 
+//
 /* Compare the two operands */
 static int cmp_op_copy_assoc(const void *a, const void *b) {
        const op_copy_assoc_t *op1 = a;

diff --git a/ir/be/bemachnode.h b/ir/be/bemachnode.h
index fed9c22..9fb202c 100644 (file)
--- a/ir/be/bemachnode.h
+++ b/ir/be/bemachnode.h
@@ -26,7 +26,7 @@
 #ifndef FIRM_BE_BEMACHNODES_H
 #define FIRM_BE_BEMACHNODES_H
 
-#include "irnode.h"
+#include "firm_types.h"
 
 /*
  * Machine nodes can have machine operands as inputs.

diff --git a/ir/be/bespill.h b/ir/be/bespill.h
index 486c474..89aec72 100644 (file)
--- a/ir/be/bespill.h
+++ b/ir/be/bespill.h
@@ -27,7 +27,7 @@
 #ifndef FIRM_BE_BESPILL_H
 #define FIRM_BE_BESPILL_H
 
-#include "irnode.h"
+#include "firm_types.h"
 #include "debug.h"
 
 #include "bearch.h"

diff --git a/ir/be/bessaconstr.h b/ir/be/bessaconstr.h
index 745dc70..c8d77f3 100644 (file)
--- a/ir/be/bessaconstr.h
+++ b/ir/be/bessaconstr.h
@@ -49,9 +49,8 @@
 #ifndef FIRM_BE_BESSACONSTR_H
 #define FIRM_BE_BESSACONSTR_H
 
-#include <stdlib.h>
+#include "firm_types.h"
 #include "bedomfront.h"
-#include "irnode.h"
 #include "irnodeset.h"
 #include "belive.h"
 #include "beirg.h"

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 1e67fad..213f91d 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -33,6 +33,7 @@
 #include "irprintf.h"
 #include "irgwalk.h"
 #include "irhooks.h"
+#include "execfreq.h"
 #include "dbginfo_t.h"
 #include "firmstat_t.h"
 #include "irtools.h"

diff --git a/ir/be/bestat.h b/ir/be/bestat.h
index a329a85..f7b9064 100644 (file)
--- a/ir/be/bestat.h
+++ b/ir/be/bestat.h
@@ -28,10 +28,8 @@
 
 #include "firm_config.h"
 
-#include "irnode.h"
-#include "irgraph.h"
+#include "firm_types.h"
 #include "irnodeset.h"
-#include "execfreq.h"
 
 #include "beirg.h"
 #include "bestatevent.h"

diff --git a/ir/be/bestate.h b/ir/be/bestate.h
index 4faf5bf..a1c30c1 100644 (file)
--- a/ir/be/bestate.h
+++ b/ir/be/bestate.h
@@ -28,7 +28,7 @@
 #ifndef FIRM_BE_BESTATE_H
 #define FIRM_BE_BESTATE_H
 
-#include "irnode.h"
+#include "firm_types.h"
 #include "beirg.h"
 #include "bearch_t.h"
 

diff --git a/ir/be/beuses.h b/ir/be/beuses.h
index dac174f..637b419 100644 (file)
--- a/ir/be/beuses.h
+++ b/ir/be/beuses.h
@@ -27,9 +27,7 @@
 #ifndef FIRM_BE_BEUSES_H
 #define FIRM_BE_BEUSES_H
 
-#include "irgraph.h"
-#include "irnode.h"
-
+#include "firm_types.h"
 #include "belive.h"
 
 typedef struct _be_next_use_t {

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index ef9ce6d..ee4506c 100644 (file)
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -269,3 +269,16 @@ ir_node *be_get_Proj_for_pn(const ir_node *irn, long pn) {
 
        return NULL;
 }
+
+FILE *be_ffopen(const char *base, const char *ext, const char *mode) {
+       FILE *out;
+       char buf[1024];
+
+       snprintf(buf, sizeof(buf), "%s.%s", base, ext);
+       buf[sizeof(buf) - 1] = '\0';
+       if (! (out = fopen(buf, mode))) {
+               fprintf(stderr, "Cannot open file %s in mode %s\n", buf, mode);
+               return NULL;
+       }
+       return out;
+}

diff --git a/ir/be/beutil.h b/ir/be/beutil.h
index a0248f4..d25f2e4 100644 (file)
--- a/ir/be/beutil.h
+++ b/ir/be/beutil.h
@@ -30,10 +30,8 @@
 
 #include <stdio.h>
 
+#include "firm_types.h"
 #include "pset.h"
-#include "irgraph.h"
-#include "irnode.h"
-#include "irmode.h"
 
 #include "bearch_t.h"
 
@@ -103,19 +101,6 @@ void dump_allocated_irg(arch_env_t *env, ir_graph *irg, char *suffix);
 
 void be_clear_links(ir_graph *irg);
 
-static INLINE FILE *ffopen(const char *base, const char *ext, const char *mode) {
-       FILE *out;
-       char buf[1024];
-
-       snprintf(buf, sizeof(buf), "%s.%s", base, ext);
-       buf[sizeof(buf) - 1] = '\0';
-       if (! (out = fopen(buf, mode))) {
-               fprintf(stderr, "Cannot open file %s in mode %s\n", buf, mode);
-               return NULL;
-       }
-       return out;
-}
-
 /**
  * Dump a graph with schedule edges.
  * @param irg The graph.
@@ -163,4 +148,9 @@ ir_node *dom_up_search(pset *accept, ir_node *start_point_exclusive);
  */
 ir_node *be_get_Proj_for_pn(const ir_node *irn, long pn);
 
+/**
+ * Opens a file named base.ext with the mode mode.
+ */
+FILE *be_ffopen(const char *base, const char *ext, const char *mode);
+
 #endif /* FIRM_BE_BEUTIL_H */