X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=277d3fec466a9590a69eac1e5d9a49cb69bd9be9;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=b901811e97eee57717d108c9b4a8a0cb6701e439;hpb=1adbf5a888bc38944df7db0c201b2a68ccb265e1;p=libfirm

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index b901811e9..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;
 		}
@@ -1744,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;
 		}
@@ -1897,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)    &&