Move current_ir_graph from ir_graph to ir_cons

It should only be used by construction algorithms

diff --git a/include/libfirm/ircons.h b/include/libfirm/ircons.h
index 6fb4fef..cf836dc 100644 (file)
--- a/include/libfirm/ircons.h
+++ b/include/libfirm/ircons.h
@@ -810,6 +810,17 @@ FIRM_API ir_node *new_ASM(int arity, ir_node *in[], ir_asm_constraint *inputs,
  * @{
  */
 
+/** Global variable holding the current ir graph.
+ *
+ *  This global variable is used by the ir construction
+ *  interface in ircons and by the optimizations.
+ *  Further it is set by all walker functions.
+ */
+FIRM_API ir_graph *current_ir_graph;
+
+FIRM_API ir_graph *get_current_ir_graph(void);
+FIRM_API void set_current_ir_graph(ir_graph *graph);
+
 /** Create an immature Block.
  *
  * An immature Block has an unknown number of predecessors.  Predecessors

diff --git a/include/libfirm/irgraph.h b/include/libfirm/irgraph.h
index 2c6fb5b..3e956ce 100644 (file)
--- a/include/libfirm/irgraph.h
+++ b/include/libfirm/irgraph.h
@@ -109,17 +109,6 @@
  * @{
  */
 
-/** Global variable holding the current ir graph.
- *
- *  This global variable is used by the ir construction
- *  interface in ircons and by the optimizations.
- *  Further it is set by all walker functions.
- */
-FIRM_API ir_graph *current_ir_graph;
-
-FIRM_API ir_graph *get_current_ir_graph(void);
-FIRM_API void set_current_ir_graph(ir_graph *graph);
-
 /**
  * Create a new ir graph to build ir for a procedure.
  *

diff --git a/ir/ana/ircfscc.c b/ir/ana/ircfscc.c
index e069082..b8155ac 100644 (file)
--- a/ir/ana/ircfscc.c
+++ b/ir/ana/ircfscc.c
@@ -37,6 +37,7 @@
 #include "irgwalk.h"
 #include "irprog_t.h"
 #include "irdump.h"
+#include "ircons_t.h"
 
 #define NO_CFLOOPS_WITHOUT_HEAD 1
 

diff --git a/ir/ana/irextbb_t.h b/ir/ana/irextbb_t.h
index 363493f..5023516 100644 (file)
--- a/ir/ana/irextbb_t.h
+++ b/ir/ana/irextbb_t.h
@@ -29,6 +29,7 @@
 #include "irgraph_t.h"
 #include "irextbb.h"
 #include "irtools.h"
+#include "ircons.h"
 
 /**
  * An extended block.

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 81e7f02..ae59f06 100644 (file)
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -36,6 +36,7 @@
 #include "util.h"
 #include "irprintf.h"
 #include "error.h"
+#include "ircons.h"
 
 /*--------------------------------------------------------------------*/
 /** Accessing the out datastructures                                 **/

diff --git a/ir/ana/irscc.c b/ir/ana/irscc.c
index 88caa5b..a37b057 100644 (file)
--- a/ir/ana/irscc.c
+++ b/ir/ana/irscc.c
@@ -40,6 +40,7 @@
 #include "irdump.h"
 #include "array.h"
 #include "pmap.h"
+#include "ircons.h"
 
 /* A variant of the loop tree that avoids loops without head.
    This reduces the depth of the loop tree. */

diff --git a/ir/ana/irtypeinfo.c b/ir/ana/irtypeinfo.c
index a83d641..d361c38 100644 (file)
--- a/ir/ana/irtypeinfo.c
+++ b/ir/ana/irtypeinfo.c
@@ -133,7 +133,7 @@ ir_type *get_irn_typeinfo_type(const ir_node *n)
 
 void set_irn_typeinfo_type(ir_node *n, ir_type *tp)
 {
-       assert(get_irg_typeinfo_state(current_ir_graph) != ir_typeinfo_none);
+       assert(get_irg_typeinfo_state(get_irn_irg(n)) != ir_typeinfo_none);
 
        pmap_insert(type_node_map, (void *)n, (void *)tp);
 }

diff --git a/ir/ana/vrp.c b/ir/ana/vrp.c
index 1c7953d..8165fc2 100644 (file)
--- a/ir/ana/vrp.c
+++ b/ir/ana/vrp.c
@@ -515,7 +515,7 @@ static void vrp_first_pass(ir_node *n, void *e)
 
        vrp_update_node(env->info, n);
 
-       assure_irg_outs(get_current_ir_graph());
+       assure_irg_outs(get_irn_irg(n));
        for (i = get_irn_n_outs(n) - 1; i >=0; --i) {
                ir_node *succ = get_irn_out(n, i);
                if (bitset_is_set(env->visited, get_irn_idx(succ))) {

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index 40d414e..7aa0a41 100644 (file)
--- a/ir/be/arm/arm_emitter.c
+++ b/ir/be/arm/arm_emitter.c
@@ -833,7 +833,7 @@ static void arm_emit_node(const ir_node *irn)
                (*emit)(irn);
        } else {
                panic("Error: No emit handler for node %+F (graph %+F)\n",
-                     irn, current_ir_graph);
+                     irn, get_irn_irg(irn));
        }
 }
 

diff --git a/ir/be/beinfo.c b/ir/be/beinfo.c
index 53aca77..56f5964 100644 (file)
--- a/ir/be/beinfo.c
+++ b/ir/be/beinfo.c
@@ -36,7 +36,7 @@
 
 static copy_attr_func old_phi_copy_attr;
 
-void be_info_new_node(ir_node *node)
+void be_info_new_node(ir_graph *irg, ir_node *node)
 {
        struct obstack *obst;
        backend_info_t *info;
@@ -45,7 +45,7 @@ void be_info_new_node(ir_node *node)
        if (is_Proj(node))
                return;
 
-       obst = be_get_be_obst(current_ir_graph);
+       obst = be_get_be_obst(irg);
        info = OALLOCZ(obst, backend_info_t);
 
        assert(node->backend_info == NULL);
@@ -124,8 +124,9 @@ int be_nodes_equal(const ir_node *node1, const ir_node *node2)
 
 static void init_walker(ir_node *node, void *data)
 {
+       ir_graph *irg = get_irn_irg(node);
        (void) data;
-       be_info_new_node(node);
+       be_info_new_node(irg, node);
 }
 
 static bool initialized = false;

diff --git a/ir/be/beinfo.h b/ir/be/beinfo.h
index 18e225b..c421ea3 100644 (file)
--- a/ir/be/beinfo.h
+++ b/ir/be/beinfo.h
@@ -60,7 +60,7 @@ static inline backend_info_t *be_get_info(const ir_node *node)
 void be_info_init(void);
 void be_info_free(void);
 void be_info_init_irg(ir_graph *irg);
-void be_info_new_node(ir_node *node);
+void be_info_new_node(ir_graph *irg, ir_node *node);
 void be_info_duplicate(const ir_node *old_node, ir_node *new_node);
 int be_info_initialized(const ir_graph *irg);
 

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 45917af..ddf438b 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -49,6 +49,7 @@
 #include "execfreq.h"
 #include "irprofile.h"
 #include "irpass_t.h"
+#include "ircons.h"
 
 #include "bearch.h"
 #include "be_t.h"

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index bdc8d9d..1fc426d 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -238,7 +238,7 @@ unsigned long be_count_insns(ir_graph *irg)
 static void block_count_walker(ir_node *node, void *data)
 {
        unsigned long *cnt = (unsigned long*)data;
-       if (node == get_irg_end_block(current_ir_graph))
+       if (node == get_irg_end_block(get_irn_irg(node)))
                return;
        (*cnt)++;
 }

diff --git a/ir/be/ia32/ia32_address_mode.c b/ir/be/ia32/ia32_address_mode.c
index a401c72..78c9084 100644 (file)
--- a/ir/be/ia32/ia32_address_mode.c
+++ b/ir/be/ia32/ia32_address_mode.c
@@ -66,7 +66,7 @@ static bool do_is_immediate(const ir_node *node, int *symconsts, bool negate)
 #ifdef DEBUG_libfirm
                        ir_fprintf(stderr,
                                   "Optimisation warning tarval of %+F(%+F) is not a long.\n",
-                                  node, current_ir_graph);
+                                  node, get_irn_irg(node));
 #endif
                        return false;
                }

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 65f4f50..d63111f 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -60,6 +60,7 @@
 #include "raw_bitset.h"
 #include "dbginfo.h"
 #include "lc_opts.h"
+#include "ircons.h"
 
 #include "besched.h"
 #include "benode.h"

diff --git a/ir/be/sparc/sparc_emitter.c b/ir/be/sparc/sparc_emitter.c
index 108547c..50f6e70 100644 (file)
--- a/ir/be/sparc/sparc_emitter.c
+++ b/ir/be/sparc/sparc_emitter.c
@@ -1251,7 +1251,7 @@ static void sparc_emit_node(const ir_node *node)
                (*func) (node);
        } else {
                panic("No emit handler for node %+F (graph %+F)\n", node,
-                     current_ir_graph);
+                     get_irn_irg(node));
        }
 }
 

diff --git a/ir/ir/irgopt.c b/ir/ir/irgopt.c
index 9bf1bd6..068e2be 100644 (file)
--- a/ir/ir/irgopt.c
+++ b/ir/ir/irgopt.c
@@ -35,6 +35,7 @@
 #include "irgopt.h"
 #include "irgmod.h"
 #include "irgwalk.h"
+#include "ircons.h"
 
 #include "adt/pdeq.h"
 

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index 02fdb5d..48b8165 100644 (file)
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -36,6 +36,7 @@
 #include "irgwalk.h"
 #include "irhooks.h"
 #include "entity_t.h"
+#include "ircons.h"
 
 #include "error.h"
 #include "pset_new.h"

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index 2ad7f91..e58a843 100644 (file)
--- a/ir/ir/irgwalk_blk.c
+++ b/ir/ir/irgwalk_blk.c
@@ -31,6 +31,7 @@
 #include "irhooks.h"
 #include "array.h"
 #include "hashptr.h"
+#include "ircons.h"
 
 #define _get_walk_arity(env, node) \
        ((env)->follow_deps ? get_irn_ins_or_deps((node)) : get_irn_arity((node)))

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index a241e2c..530ebf1 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -183,7 +183,7 @@ ir_node *new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op,
 
        hook_new_node(irg, res);
        if (get_irg_phase_state(irg) == phase_backend) {
-               be_info_new_node(res);
+               be_info_new_node(irg, res);
        }
 
        return res;

diff --git a/ir/ir/irpass.c b/ir/ir/irpass.c
index 5ccf062..705eb5b 100644 (file)
--- a/ir/ir/irpass.c
+++ b/ir/ir/irpass.c
@@ -31,6 +31,7 @@
 #include "irprog_t.h"
 #include "irdump.h"
 #include "irverify.h"
+#include "ircons.h"
 #include "xmalloc.h"
 
 typedef void (*void_pass_func_irg)(ir_graph *irg);

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index d4b3a2c..09022ea 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -35,6 +35,7 @@
 #include "obst.h"
 #include "irop_t.h"
 #include "irmemory.h"
+#include "ircons.h"
 
 /** The initial name of the irp program. */
 #define INITAL_PROG_NAME "no_name_set"

diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c
index 4811add..d919256 100644 (file)
--- a/ir/ir/irverify.c
+++ b/ir/ir/irverify.c
@@ -36,6 +36,7 @@
 #include "irflag_t.h"
 #include "irpass_t.h"
 #include "irnodeset.h"
+#include "ircons.h"
 
 /** if this flag is set, verify entity types in Load & Store nodes */
 static int verify_entities = 0;

diff --git a/ir/stat/dags.c b/ir/stat/dags.c
index d27013d..c9e283d 100644 (file)
--- a/ir/stat/dags.c
+++ b/ir/stat/dags.c
@@ -30,6 +30,7 @@
 #include "irdump.h"
 #include "dags.h"
 #include "irtools.h"
+#include "ircons.h"
 
 enum dag_counting_options_t {
        FIRMSTAT_COPY_CONSTANTS = 0x00000001,  /**< if set, constants will be treated as they are in

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index 4af0307..9ea6d3a 100644 (file)
--- a/ir/stat/firmstat.c
+++ b/ir/stat/firmstat.c
@@ -39,6 +39,7 @@
 #include "xmalloc.h"
 #include "irhooks.h"
 #include "util.h"
+#include "ircons.h"
 
 /*
  * need this to be static:

diff --git a/ir/tr/trverify.c b/ir/tr/trverify.c
index 8a576f4..6ba2524 100644 (file)
--- a/ir/tr/trverify.c
+++ b/ir/tr/trverify.c
@@ -31,6 +31,7 @@
 #include "irgwalk.h"
 #include "error.h"
 #include "tv.h"
+#include "ircons.h"
 
 #ifdef NDEBUG
 /*

diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c
index 50055c3..523b1fe 100644 (file)
--- a/ir/tr/typewalk.c
+++ b/ir/tr/typewalk.c
@@ -41,6 +41,7 @@
 #include "irnode_t.h"
 #include "irgwalk.h"
 #include "error.h"
+#include "ircons.h"
 
 /**
  * The walker environment