- remove block parameter from new_r_Proj and new_rd_Proj

[libfirm] / ir / ir / ircons.c

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 7fdee5b..18f8826 100644 (file)
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -252,14 +252,13 @@ static ir_node *new_bd_Const_long(dbg_info *db, ir_mode *mode, long value)
        return new_rd_Const(db, irg, new_tarval_from_long(value, mode));
 }  /* new_bd_Const_long */
 
-static ir_node *new_bd_defaultProj(dbg_info *db, ir_node *block, ir_node *arg,
-                                   long max_proj)
+static ir_node *new_bd_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
 {
        ir_node  *res;
 
        assert(arg->op == op_Cond);
        arg->attr.cond.default_proj = max_proj;
-       res = new_rd_Proj(db, block, arg, mode_X, max_proj);
+       res = new_rd_Proj(db, arg, mode_X, max_proj);
        return res;
 }  /* new_bd_defaultProj */
 
@@ -439,16 +438,9 @@ ir_node *new_rd_Const_long(dbg_info *db, ir_graph *irg, ir_mode *mode, long valu
        return new_rd_Const(db, irg, new_tarval_from_long(value, mode));
 }  /* new_rd_Const_long */
 
-ir_node *new_rd_defaultProj(dbg_info *db, ir_node *block, ir_node *arg, long max_proj)
+ir_node *new_rd_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
 {
-       ir_node  *res;
-       ir_graph *rem = current_ir_graph;
-
-       current_ir_graph = get_Block_irg(block);
-       res = new_bd_defaultProj(db, block, arg, max_proj);
-       current_ir_graph = rem;
-
-       return res;
+       return new_bd_defaultProj(db, arg, max_proj);
 }  /* new_rd_defaultProj */
 
 ir_node *new_rd_simpleSel(dbg_info *db, ir_node *block, ir_node *store,
@@ -499,13 +491,6 @@ ir_node *new_rd_SymConst_ofs_ent(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_
        return new_rd_SymConst_type(db, irg, mode, sym, symconst_ofs_ent, tp);
 }  /* new_rd_SymConst_ofs_ent */
 
-ir_node *new_rd_SymConst_addr_name(dbg_info *db, ir_graph *irg, ir_mode *mode, ident *symbol, ir_type *tp)
-{
-       symconst_symbol sym;
-       sym.ident_p = symbol;
-       return new_rd_SymConst_type(db, irg, mode, sym, symconst_addr_name, tp);
-}  /* new_rd_SymConst_addr_name */
-
 ir_node *new_rd_SymConst_type_tag(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol, ir_type *tp)
 {
        symconst_symbol sym;
@@ -566,7 +551,8 @@ ir_node *new_rd_EndExcept(dbg_info *db, ir_graph *irg, ir_node *block)
 ir_node *new_rd_ASM(dbg_info *db, ir_node *block,
                     int arity, ir_node *in[], ir_asm_constraint *inputs,
                     int n_outs, ir_asm_constraint *outputs,
-                    int n_clobber, ident *clobber[], ident *asm_text) {
+                    int n_clobber, ident *clobber[], ident *asm_text)
+{
        ir_node  *res;
        ir_graph *rem = current_ir_graph;
 
@@ -597,12 +583,14 @@ ir_node *new_r_Const_type(ir_graph *irg, tarval *con, ir_type *tp)
 {
        return new_rd_Const_type(NULL, irg, con, tp);
 }
-ir_node *new_r_SymConst(ir_graph *irg, ir_mode *mode,
-                        symconst_symbol value, symconst_kind symkind) {
+ir_node *new_r_SymConst(ir_graph *irg, ir_mode *mode, symconst_symbol value,
+                        symconst_kind symkind)
+{
        return new_rd_SymConst(NULL, irg, mode, value, symkind);
 }
-ir_node *new_r_simpleSel(ir_node *block, ir_node *store,
-                         ir_node *objptr, ir_entity *ent) {
+ir_node *new_r_simpleSel(ir_node *block, ir_node *store, ir_node *objptr,
+                         ir_entity *ent)
+{
        return new_rd_Sel(NULL, block, store, objptr, 0, NULL, ent);
 }
 ir_node *new_r_Phi(ir_node *block, int arity, ir_node **in, ir_mode *mode)
@@ -613,9 +601,9 @@ ir_node *new_r_Sync(ir_node *block, int arity, ir_node *in[])
 {
        return new_rd_Sync(NULL, block, arity, in);
 }
-ir_node *new_r_defaultProj(ir_node *block, ir_node *arg, long max_proj)
+ir_node *new_r_defaultProj(ir_node *arg, long max_proj)
 {
-       return new_rd_defaultProj(NULL, block, arg, max_proj);
+       return new_rd_defaultProj(NULL, arg, max_proj);
 }
 ir_node *new_r_Bad(ir_graph *irg)
 {
@@ -636,7 +624,8 @@ ir_node *new_r_NoMem(ir_graph *irg)
 ir_node *new_r_ASM(ir_node *block,
                    int arity, ir_node *in[], ir_asm_constraint *inputs,
                    int n_outs, ir_asm_constraint *outputs,
-                   int n_clobber, ident *clobber[], ident *asm_text) {
+                   int n_clobber, ident *clobber[], ident *asm_text)
+{
        return new_rd_ASM(NULL, block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, asm_text);
 }
 
@@ -1564,7 +1553,8 @@ ir_node *new_NoMem(void)
 }
 ir_node *new_ASM(int arity, ir_node *in[], ir_asm_constraint *inputs,
                  int n_outs, ir_asm_constraint *outputs,
-                 int n_clobber, ident *clobber[], ident *asm_text) {
+                 int n_clobber, ident *clobber[], ident *asm_text)
+{
        return new_d_ASM(NULL, arity, in, inputs, n_outs, outputs, n_clobber, clobber, asm_text);
 }