X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=f0e77c65a83e677d91d6392b86f149efa83bdddc;hb=fe3c81727251945fa818d22165b3afc33ea2019f;hp=fe15be5b38ef9c1bcdfa02548c266929fb772cf2;hpb=97b67441422777d2bd3b29dc4257f6d569fff308;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index fe15be5b3..f0e77c65a 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -96,7 +96,9 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
 			}
 
 			if (reqs[i]->type & arch_register_req_type_should_be_same) {
-				ir_fprintf(F, " same as %+F", get_irn_n(n, reqs[i]->other_same));
+				ir_fprintf(F, " same as %+F", get_irn_n(n, reqs[i]->other_same[0]));
+				if (reqs[i]->other_same[1] != -1)
+					ir_fprintf(F, " or %+F", get_irn_n(n, reqs[i]->other_same[1]));
 			}
 
 			if (reqs[i]->type & arch_register_req_type_should_be_different) {
@@ -123,22 +125,15 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
 static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 	ir_mode     *mode = NULL;
 	int          bad  = 0;
-	int          i, n_res, am_flav, flags;
+	int          i, n_res, flags;
 	const arch_register_req_t **reqs;
 	const arch_register_t     **slots;
 
 	switch (reason) {
 		case dump_node_opcode_txt:
 			fprintf(F, "%s", get_irn_opname(n));
-			break;
-
-		case dump_node_mode_txt:
-			if (is_ia32_Ld(n) || is_ia32_St(n)) {
-				mode = get_ia32_ls_mode(n);
-				fprintf(F, "[%s]", mode ? get_mode_name(mode) : "?NOMODE?");
-			}
 
-			if(is_ia32_Immediate(n)) {
+			if(is_ia32_Immediate(n) || is_ia32_Const(n)) {
 				const ia32_immediate_attr_t *attr
 					= get_ia32_immediate_attr_const(n);
 
@@ -149,7 +144,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 					}
 					fputs(get_entity_name(attr->symconst), F);
 				}
-				if(attr->offset != 0) {
+				if(attr->offset != 0 || attr->symconst == NULL) {
 					if(attr->offset > 0 && attr->symconst != NULL) {
 						fputc('+', F);
 					}
@@ -157,28 +152,42 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				}
 			}
 
-			break;
+			{
+				const ia32_attr_t *attr = get_ia32_attr_const(n);
 
-		case dump_node_nodeattr_txt:
-			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
-				if(is_ia32_ImmSymConst(n)) {
-					ir_entity *ent = get_ia32_Immop_symconst(n);
-					ident *id = get_entity_ld_ident(ent);
-					fprintf(F, "[SymC %s]", get_id_str(id));
-				} else {
-					char buf[128];
-					tarval *tv = get_ia32_Immop_tarval(n);
-
-					tarval_snprintf(buf, sizeof(buf), tv);
-					fprintf(F, "[%s]", buf);
+				if(attr->am_sc != NULL || attr->am_offs != 0)
+					fputs(" [", F);
+
+				if(attr->am_sc != NULL) {
+					if(attr->data.am_sc_sign) {
+						fputc('-', F);
+					}
+					fputs(get_entity_name(attr->am_sc), F);
+				}
+				if(attr->am_offs != 0) {
+					if(attr->am_offs > 0 && attr->am_sc != NULL) {
+						fputc('+', F);
+					}
+					fprintf(F, "%d", attr->am_offs);
 				}
+
+				if(attr->am_sc != NULL || attr->am_offs != 0)
+					fputc(']', F);
+			}
+			break;
+
+		case dump_node_mode_txt:
+			if (is_ia32_Ld(n) || is_ia32_St(n)) {
+				mode = get_ia32_ls_mode(n);
+				fprintf(F, "[%s]", mode ? get_mode_name(mode) : "?NOMODE?");
 			}
+			break;
 
+		case dump_node_nodeattr_txt:
 			if (! is_ia32_Lea(n)) {
 				if (is_ia32_AddrModeS(n)) {
 					fprintf(F, "[AM S] ");
-				}
-				else if (is_ia32_AddrModeD(n)) {
+				} else if (is_ia32_AddrModeD(n)) {
 					fprintf(F, "[AM D] ");
 				}
 			}
@@ -232,24 +241,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
-			/* dump immop type */
-			fprintf(F, "immediate = ");
-			switch (get_ia32_immop_type(n)) {
-				case ia32_ImmNone:
-					fprintf(F, "None");
-					break;
-				case ia32_ImmConst:
-					fprintf(F, "Const");
-					break;
-				case ia32_ImmSymConst:
-					fprintf(F, "SymConst");
-					break;
-				default:
-					fprintf(F, "unknown (%d)", get_ia32_immop_type(n));
-					break;
-			}
-			fprintf(F, "\n");
-
 			/* dump supported am */
 			fprintf(F, "AM support = ");
 			switch (get_ia32_am_support(n)) {
@@ -271,28 +262,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
-			/* dump am flavour */
-			fprintf(F, "AM flavour =");
-			am_flav = get_ia32_am_flavour(n);
-			if (am_flav == ia32_am_N) {
-				fprintf(F, " none");
-			}
-			else {
-				if (am_flav & ia32_O) {
-					fprintf(F, " O");
-				}
-				if (am_flav & ia32_B) {
-					fprintf(F, " B");
-				}
-				if (am_flav & ia32_I) {
-					fprintf(F, " I");
-				}
-				if (am_flav & ia32_S) {
-					fprintf(F, " S");
-				}
-			}
-			fprintf(F, " (%d)\n", am_flav);
-
 			/* dump AM offset */
 			if(get_ia32_am_offs_int(n) != 0) {
 				fprintf(F, "AM offset = %d\n", get_ia32_am_offs_int(n));
@@ -309,17 +278,11 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			if(is_ia32_SwitchJmp(n)) {
+			if(is_ia32_SwitchJmp(n) || is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
 				fprintf(F, "pn_code = %ld\n", get_ia32_pncode(n));
 			} else {
-				if(get_ia32_pncode(n) & ia32_pn_Cmp_Unsigned) {
-					long pnc = get_ia32_pncode(n);
-					fprintf(F, "pn_code = %ld (%s, unsigned)\n",
-					        pnc, get_pnc_string(pnc & ~ia32_pn_Cmp_Unsigned));
-				} else {
-					fprintf(F, "pn_code = %ld (%s)\n", get_ia32_pncode(n),
-					        get_pnc_string(get_ia32_pncode(n)));
-				}
+				fprintf(F, "pn_code = %ld (%s)\n", get_ia32_pncode(n),
+				        get_pnc_string(get_ia32_pncode(n)));
 			}
 
 			/* dump n_res */
@@ -331,9 +294,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			/* commutative */
 			fprintf(F, "commutative = %d\n", is_ia32_commutative(n));
 
-			/* emit cl */
-			fprintf(F, "emit cl instead of ecx = %d\n", is_ia32_emit_cl(n));
-
 			/* got lea */
 			fprintf(F, "got loea = %d\n", is_ia32_got_lea(n));
 
@@ -472,14 +432,6 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
 	attr->data.tp     = tp;
 }
 
-/**
- * Gets the immediate op type of an ia32 node.
- */
-ia32_immop_type_t get_ia32_immop_type(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.imm_tp;
-}
-
 /**
  * Gets the supported address mode of an ia32 node
  */
@@ -488,28 +440,23 @@ ia32_am_type_t get_ia32_am_support(const ir_node *node) {
 	return attr->data.am_support;
 }
 
-/**
- * Sets the supported address mode of an ia32 node
- */
-void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp) {
-	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.am_support = am_tp;
-}
-
-/**
- * Gets the address mode flavour of an ia32 node
- */
-ia32_am_flavour_t get_ia32_am_flavour(const ir_node *node) {
+ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.am_flavour;
+	return attr->data.am_arity;
 }
 
 /**
- * Sets the address mode flavour of an ia32 node
+ * Sets the supported address mode of an ia32 node
  */
-void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) {
+void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp,
+                         ia32_am_arity_t arity) {
 	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.am_flavour = am_flavour;
+	attr->data.am_support = am_tp;
+	attr->data.am_arity   = arity;
+
+	assert((am_tp == ia32_am_None && arity == ia32_am_arity_none) ||
+	       (am_tp != ia32_am_None &&
+	       ((arity == ia32_am_unary) || (arity == ia32_am_binary) || (arity == ia32_am_ternary))));
 }
 
 /**
@@ -589,34 +536,17 @@ void set_ia32_am_scale(ir_node *node, int scale) {
 	attr->data.am_scale = scale;
 }
 
-/**
- * Return the tarval of an immediate operation or NULL in case of SymConst
- */
-tarval *get_ia32_Immop_tarval(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	assert(attr->data.imm_tp == ia32_ImmConst);
-    return attr->cnst_val.tv;
-}
-
-/**
- * Sets the attributes of an immediate operation to the specified tarval
- */
-void set_ia32_Immop_tarval(ir_node *node, tarval *tv) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = ia32_ImmConst;
-	attr->cnst_val.tv = tv;
-}
-
-void set_ia32_Immop_symconst(ir_node *node, ir_entity *entity) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = ia32_ImmSymConst;
-	attr->cnst_val.sc = entity;
-}
-
-ir_entity *get_ia32_Immop_symconst(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	assert(attr->data.imm_tp == ia32_ImmSymConst);
-	return attr->cnst_val.sc;
+void ia32_copy_am_attrs(ir_node *to, const ir_node *from)
+{
+	set_ia32_ls_mode(to, get_ia32_ls_mode(from));
+	set_ia32_am_scale(to, get_ia32_am_scale(from));
+	set_ia32_am_sc(to, get_ia32_am_sc(from));
+	if(is_ia32_am_sc_sign(from))
+		set_ia32_am_sc_sign(to);
+	add_ia32_am_offs_int(to, get_ia32_am_offs_int(from));
+	set_ia32_frame_ent(to, get_ia32_frame_ent(from));
+	if (is_ia32_use_frame(from))
+		set_ia32_use_frame(to);
 }
 
 /**
@@ -667,30 +597,6 @@ int is_ia32_commutative(const ir_node *node) {
 	return attr->data.is_commutative;
 }
 
-/**
- * Sets node emit_cl.
- */
-void set_ia32_emit_cl(ir_node *node) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.emit_cl = 1;
-}
-
-/**
- * Clears node emit_cl.
- */
-void clear_ia32_emit_cl(ir_node *node) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.emit_cl = 0;
-}
-
-/**
- * Checks if node needs %cl.
- */
-int is_ia32_emit_cl(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.emit_cl;
-}
-
 /**
  * Sets node got_lea.
  */
@@ -885,22 +791,6 @@ int get_ia32_n_res(const ir_node *node) {
 	return ARR_LEN(attr->slots);
 }
 
-/**
- * Returns the flavour of an ia32 node,
- */
-ia32_op_flavour_t get_ia32_flavour(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.op_flav;
-}
-
-/**
- * Sets the flavour of an ia32 node to flavour_Div/Mod/DivMod/Mul/Mulh.
- */
-void set_ia32_flavour(ir_node *node, ia32_op_flavour_t op_flav) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.op_flav = op_flav;
-}
-
 /**
  * Returns the projnum code.
  */
@@ -992,71 +882,6 @@ void set_ia32_orig_node(ir_node *node, const char *name) {
  *     |_|
  ******************************************************************************************************/
 
-/**
- * Copy the attributes from an ia32_Const to an Immop (Add_i, Sub_i, ...) node
- */
-void copy_ia32_Immop_attr(ir_node *node, ir_node *from) {
-	ia32_immop_type_t immop_type = get_ia32_immop_type(from);
-
-	if(immop_type == ia32_ImmConst) {
-		set_ia32_Immop_tarval(node, get_ia32_Immop_tarval(from));
-	} else if(immop_type == ia32_ImmSymConst) {
-		set_ia32_Immop_symconst(node, get_ia32_Immop_symconst(from));
-	} else {
-		ia32_attr_t *attr = get_ia32_attr(node);
-		assert(immop_type == ia32_ImmNone);
-		attr->data.imm_tp = ia32_ImmNone;
-	}
-}
-
-/**
- * Copy the attributes from a Firm Const/SymConst to an ia32_Const
- */
-void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
-	assert(is_ia32_Cnst(ia32_cnst) && "Need ia32_Const to set Const attr");
-
-	switch (get_irn_opcode(cnst)) {
-		case iro_Const:
-			set_ia32_Const_tarval(ia32_cnst, get_Const_tarval(cnst));
-			break;
-		case iro_SymConst:
-			assert(get_SymConst_kind(cnst) == symconst_addr_ent);
-			set_ia32_Immop_symconst(ia32_cnst, get_SymConst_entity(cnst));
-			break;
-		case iro_Unknown:
-			assert(0 && "Unknown Const NYI");
-			break;
-		default:
-			assert(0 && "Cannot create ia32_Const for this opcode");
-	}
-}
-
-void set_ia32_Const_tarval(ir_node *ia32_cnst, tarval *tv) {
-#if 0
-	if(mode_is_reference(get_tarval_mode(tv))) {
-		if(tarval_is_null(tv)) {
-			tv = get_tarval_null(mode_Iu);
-		} else {
-			long val;
-			/* workaround... */
-			if(!tarval_is_long(tv))
-				panic("Can't convert reference tarval to mode_Iu at %+F", ia32_cnst);
-			val = get_tarval_long(tv);
-			tv = new_tarval_from_long(val, mode_Iu);
-		}
-	} else {
-		tv = tarval_convert_to(tv, mode_Iu);
-	}
-#else
-	tv = tarval_convert_to(tv, mode_Iu);
-#endif
-
-	assert(tv != get_tarval_bad() && tv != get_tarval_undefined()
-			&& tv != NULL);
-	set_ia32_Immop_tarval(ia32_cnst, tv);
-}
-
-
 /**
  * Sets the AddrMode(S|D) attribute
  */
@@ -1075,22 +900,6 @@ void set_ia32_AddrMode(ir_node *node, char direction) {
 	}
 }
 
-/**
- * Returns whether or not the node is an immediate operation with Const.
- */
-int is_ia32_ImmConst(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.imm_tp == ia32_ImmConst);
-}
-
-/**
- * Returns whether or not the node is an immediate operation with SymConst.
- */
-int is_ia32_ImmSymConst(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.imm_tp == ia32_ImmSymConst);
-}
-
 /**
  * Returns whether or not the node is an AddrModeS node.
  */
@@ -1131,14 +940,6 @@ int is_ia32_St(const ir_node *node) {
 	       op == iro_ia32_fstp;
 }
 
-/**
- * Checks if node is a Const or xConst/vfConst.
- */
-int is_ia32_Cnst(const ir_node *node) {
-	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Const || op == iro_ia32_xConst || op == iro_ia32_vfConst;
-}
-
 /**
  * Returns the name of the OUT register at position pos.
  */
@@ -1163,6 +964,19 @@ int get_ia32_out_regnr(const ir_node *node, int pos) {
 	return arch_register_get_index(attr->slots[pos]);
 }
 
+void ia32_swap_left_right(ir_node *node)
+{
+	ia32_attr_t *attr  = get_ia32_attr(node);
+	ir_node     *left  = get_irn_n(node, n_ia32_binary_left);
+	ir_node     *right = get_irn_n(node, n_ia32_binary_right);
+
+	attr->data.cmp_flipped = !attr->data.cmp_flipped;
+	assert(is_ia32_commutative(node));
+	set_irn_n(node, n_ia32_binary_left,  right);
+	set_irn_n(node, n_ia32_binary_right, left);
+	set_ia32_pncode(node, get_inversed_pnc(get_ia32_pncode(node)));
+}
+
 /**
  * Returns the OUT register at position pos.
  */
@@ -1184,9 +998,9 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
                           const be_execution_unit_t ***execution_units,
                           int n_res, unsigned latency)
 {
-	ir_graph       *irg  = get_irn_irg(node);
-	struct obstack *obst = get_irg_obstack(irg);
-	ia32_attr_t    *attr = get_ia32_attr(node);
+	ir_graph        *irg  = get_irn_irg(node);
+	struct obstack  *obst = get_irg_obstack(irg);
+	ia32_attr_t     *attr = get_ia32_attr(node);
 
 	set_ia32_flags(node, flags);
 	set_ia32_in_req_all(node, in_reqs);
@@ -1202,7 +1016,8 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0]));
 
 	attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res);
-	memset(attr->slots, 0, n_res * sizeof(attr->slots[0]));
+	/* void* cast to suppress an incorrect warning on MSVC */
+	memset((void*)attr->slots, 0, n_res * sizeof(attr->slots[0]));
 }
 
 void
@@ -1212,6 +1027,7 @@ init_ia32_x87_attributes(ir_node *res)
 	ia32_attr_t *attr  = get_ia32_attr(res);
 	attr->attr_type   |= IA32_ATTR_ia32_x87_attr_t;
 #endif
+	ia32_current_cg->do_x87_sim = 1;
 }
 
 void
@@ -1229,7 +1045,7 @@ init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 {
 	ia32_immediate_attr_t *attr = get_irn_generic_attr(res);
 
-#ifndef DEBUG
+#ifndef NDEBUG
 	attr->attr.attr_type   |= IA32_ATTR_ia32_immediate_attr_t;
 #endif
 	attr->symconst             = symconst;
@@ -1262,41 +1078,40 @@ ir_node *get_ia32_result_proj(const ir_node *node)
 
 /* default compare operation to compare attributes */
 int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
-	if (a->data.tp != b->data.tp
-			|| a->data.imm_tp != b->data.imm_tp)
+	if (a->data.tp != b->data.tp)
 		return 1;
 
-	if (a->data.imm_tp == ia32_ImmConst
-			&& a->cnst_val.tv != b->cnst_val.tv)
-		return 1;
-
-	if (a->data.imm_tp == ia32_ImmSymConst
-			&& a->cnst_val.sc != b->cnst_val.sc)
-		return 1;
-
-	if (a->data.am_flavour != b->data.am_flavour
-	    || a->data.am_scale != b->data.am_scale
+	if (a->data.am_scale != b->data.am_scale
 	    || a->data.am_sc_sign != b->data.am_sc_sign
 	    || a->am_offs != b->am_offs
 	    || a->am_sc != b->am_sc
 	    || a->ls_mode != b->ls_mode)
 		return 1;
 
+	/* nodes with not yet assigned entities shouldn't be CSEd (important for
+	 * unsigned int -> double conversions */
+	if(a->data.use_frame && a->frame_ent == NULL)
+		return 1;
+	if(b->data.use_frame && b->frame_ent == NULL)
+		return 1;
+
 	if (a->data.use_frame != b->data.use_frame
-	    || a->data.use_frame != b->data.use_frame
 	    || a->frame_ent != b->frame_ent)
 		return 1;
 
 	if(a->pn_code != b->pn_code)
 		return 1;
 
-	if (a->data.tp != b->data.tp
-	    || a->data.op_flav != b->data.op_flav)
+	if (a->data.tp != b->data.tp)
 		return 1;
 
 	if (a->data.except_label != b->data.except_label)
 		return 1;
 
+	if (a->data.cmp_flipped != b->data.cmp_flipped
+			|| a->data.cmp_unsigned != b->data.cmp_unsigned)
+		return 1;
+
 	return 0;
 }
 
@@ -1368,16 +1183,3 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
 
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"
-
-/**
- * Registers the ia32_copy_attr function for all ia32 opcodes.
- */
-void ia32_register_copy_attr_func(void) {
-	int i;
-
-	for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
-		ir_op *op = get_irp_opcode(i);
-		if (is_ia32_op(op))
-			op->ops.copy_attr = ia32_copy_attr;
-	}
-}