X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=277d3fec466a9590a69eac1e5d9a49cb69bd9be9;hb=31ef53136fdb86d4a98919c2148c95cadea4ea81;hp=95575f1d57af575a7edf345d5552387a1131935e;hpb=f2d236f4fac425604e8552790432332ff216c065;p=libfirm

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 95575f1d5..277d3fec4 100644
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -40,12 +40,11 @@
 #include "iropt_t.h"
 #include "irgmod.h"
 #include "irhooks.h"
-#include "array.h"
+#include "array_t.h"
 #include "irbackedge_t.h"
 #include "irflag_t.h"
 #include "iredges_t.h"
 #include "irflag_t.h"
-#include "xmalloc.h"
 
 #if USE_EXPLICIT_PHI_IN_STACK
 /* A stack needed for the automatic Phi node construction in constructor
@@ -254,7 +253,7 @@ new_bd_Phi(dbg_info *db, ir_node *block, int arity, ir_node **in, ir_mode *mode)
 	res->attr.phi.u.backedge = new_backedge_arr(irg->obst, arity);
 
 	for (i = arity - 1; i >= 0; --i)
-		if (get_irn_op(in[i]) == op_Unknown) {
+		if (is_Unknown(in[i])) {
 			has_unknown = 1;
 			break;
 		}
@@ -748,30 +747,6 @@ new_bd_Mux(dbg_info *db, ir_node *block,
 	return res;
 }  /* new_bd_Mux */
 
-static ir_node *
-new_bd_Psi(dbg_info *db, ir_node *block,
-           int arity, ir_node *cond[], ir_node *vals[], ir_mode *mode) {
-	ir_node  **in;
-	ir_node  *res;
-	ir_graph *irg = current_ir_graph;
-	int i;
-
-	NEW_ARR_A(ir_node *, in, 2 * arity + 1);
-
-	for (i = 0; i < arity; ++i) {
-		in[2 * i]     = cond[i];
-		in[2 * i + 1] = vals[i];
-	}
-	in[2 * i] = vals[i];
-
-	res = new_ir_node(db, irg, block, op_Psi, mode, 2 * arity + 1, in);
-	assert(res);
-
-	res = optimize_node(res);
-	IRN_VRFY_IRG(res, irg);
-	return res;
-}  /* new_bd_Psi */
-
 static ir_node *
 new_bd_CopyB(dbg_info *db, ir_node *block,
     ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) {
@@ -862,12 +837,12 @@ new_bd_ASM(dbg_info *db, ir_node *block, int arity, ir_node *in[], ir_asm_constr
 	res->attr.assem.pin_state = op_pin_state_pinned;
 	res->attr.assem.inputs    = NEW_ARR_D(ir_asm_constraint, irg->obst, arity);
 	res->attr.assem.outputs   = NEW_ARR_D(ir_asm_constraint, irg->obst, n_outs);
-    res->attr.assem.clobber   = NEW_ARR_D(ident *, irg->obst, n_clobber);
+	res->attr.assem.clobber   = NEW_ARR_D(ident *, irg->obst, n_clobber);
 	res->attr.assem.asm_text  = asm_text;
 
-    memcpy(res->attr.assem.inputs,  inputs,  sizeof(inputs[0]) * arity);
-    memcpy(res->attr.assem.outputs, outputs, sizeof(outputs[0]) * n_outs);
-    memcpy(res->attr.assem.clobber, clobber, sizeof(clobber[0]) * n_clobber);
+	memcpy(res->attr.assem.inputs,  inputs,  sizeof(inputs[0]) * arity);
+	memcpy(res->attr.assem.outputs, outputs, sizeof(outputs[0]) * n_outs);
+	memcpy(res->attr.assem.clobber, clobber, sizeof(clobber[0]) * n_clobber);
 
 	res = optimize_node(res);
 	IRN_VRFY_IRG(res, irg);
@@ -1395,19 +1370,6 @@ new_rd_Mux(dbg_info *db, ir_graph *irg, ir_node *block,
 	return res;
 }  /* new_rd_Mux */
 
-ir_node *
-new_rd_Psi(dbg_info *db, ir_graph *irg, ir_node *block,
-           int arity, ir_node *cond[], ir_node *vals[], ir_mode *mode) {
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = irg;
-	res = new_bd_Psi(db, block, arity, cond, vals, mode);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_Psi */
-
 ir_node *new_rd_CopyB(dbg_info *db, ir_graph *irg, ir_node *block,
                       ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) {
 	ir_node  *res;
@@ -1701,10 +1663,6 @@ ir_node *new_r_Mux(ir_graph *irg, ir_node *block,
                    ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) {
 	return new_rd_Mux(NULL, irg, block, sel, ir_false, ir_true, mode);
 }
-ir_node *new_r_Psi(ir_graph *irg, ir_node *block,
-                   int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) {
-	return new_rd_Psi(NULL, irg, block, arity, conds, vals, mode);
-}
 ir_node *new_r_CopyB(ir_graph *irg, ir_node *block,
                      ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) {
 	return new_rd_CopyB(NULL, irg, block, store, dst, src, data_type);
@@ -1785,7 +1743,7 @@ new_d_Block(dbg_info *db, int arity, ir_node **in) {
 	}
 
 	for (i = arity-1; i >= 0; i--)
-		if (get_irn_op(in[i]) == op_Unknown) {
+		if (is_Unknown(in[i])) {
 			has_unknown = 1;
 			break;
 		}
@@ -1938,11 +1896,11 @@ static INLINE ir_node **new_frag_arr(ir_node *n) {
 	   finished yet. */
 	opt = get_opt_optimize(); set_optimize(0);
 	/* Here we rely on the fact that all frag ops have Memory as first result! */
-	if (get_irn_op(n) == op_Call)
+	if (is_Call(n)) {
 		arr[0] = new_Proj(n, mode_M, pn_Call_M_except);
-	else if (get_irn_op(n) == op_CopyB)
+	} else if (is_CopyB(n)) {
 		arr[0] = new_Proj(n, mode_M, pn_CopyB_M_except);
-	else {
+	} else {
 		assert((pn_Quot_M == pn_DivMod_M) &&
 		       (pn_Quot_M == pn_Div_M)    &&
 		       (pn_Quot_M == pn_Mod_M)    &&
@@ -2641,12 +2599,6 @@ new_d_Mux(dbg_info *db, ir_node *sel, ir_node *ir_false,
 	                  sel, ir_false, ir_true, mode);
 }  /* new_d_Mux */
 
-ir_node *
-new_d_Psi(dbg_info *db,int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) {
-  return new_bd_Psi(db, current_ir_graph->current_block,
-                    arity, conds, vals, mode);
-}  /* new_d_Psi */
-
 ir_node *new_d_CopyB(dbg_info *db,ir_node *store,
     ir_node *dst, ir_node *src, ir_type *data_type) {
 	ir_node *res;
@@ -3099,9 +3051,6 @@ ir_node *new_NoMem(void) {
 ir_node *new_Mux(ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) {
 	return new_d_Mux(NULL, sel, ir_false, ir_true, mode);
 }
-ir_node *new_Psi(int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) {
-	return new_d_Psi(NULL, arity, conds, vals, mode);
-}
 ir_node *new_CopyB(ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) {
 	return new_d_CopyB(NULL, store, dst, src, data_type);
 }