X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_emitter.c;h=528816ed118471072f25724236def71ed6e1c76e;hb=c5e0cbdb8a4a48b8ab3e0a90d258f664301f241f;hp=0356aaa33986b8f2b4c16ab0815b8cccd4fb678e;hpb=2c1f3ab7b5b7ed3a848bb1f220efe93d7a8f7827;p=libfirm

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 0356aaa33..528816ed1 100644
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -372,9 +372,12 @@ const char *ia32_emit_binop(const ir_node *n, ia32_emit_env_t *env) {
 
 	switch(get_ia32_op_type(n)) {
 		case ia32_Normal:
-			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
+			if (is_ia32_ImmConst(n)) {
 				lc_esnprintf(ia32_get_arg_env(), buf, SNPRINTF_BUF_LEN, "%3S, %s", n, get_ia32_cnst(n));
 			}
+			else if (is_ia32_ImmSymConst(n)) {
+				lc_esnprintf(ia32_get_arg_env(), buf, SNPRINTF_BUF_LEN, "%3S, OFFSET FLAT:%s", n, get_ia32_cnst(n));
+			}
 			else {
 				const arch_register_t *in1 = get_in_reg(n, 2);
 				const arch_register_t *in2 = get_in_reg(n, 3);
@@ -416,9 +419,9 @@ const char *ia32_emit_binop(const ir_node *n, ia32_emit_env_t *env) {
 					get_ia32_cnst(n));                               /* tell the assembler to store it's address.   */
 			}
 			else {
-				const arch_register_t *in1 = get_in_reg(n, 2);
-				ir_mode              *mode = get_ia32_res_mode(n);
-				const char           *in_name;
+				const arch_register_t *in1 = get_in_reg(n, get_irn_arity(n) == 5 ? 3 : 2);
+				ir_mode               *mode = get_ia32_res_mode(n);
+				const char            *in_name;
 
 				mode    = mode ? mode : get_ia32_ls_mode(n);
 				in_name = ia32_get_reg_name_for_mode(env, mode, in1);
@@ -550,7 +553,7 @@ const char *ia32_emit_unop(const ir_node *n, ia32_emit_env_t *env) {
 				Mulh is emitted via emit_unop
 				imul [MEM]  means EDX:EAX <- EAX * [MEM]
 			*/
-			assert(is_ia32_Mulh(n) || is_ia32_MulS(n) && "Only MulS and Mulh can have AM source as unop");
+			assert((is_ia32_Mulh(n) || is_ia32_MulS(n)) && "Only MulS and Mulh can have AM source as unop");
 			lc_esnprintf(ia32_get_arg_env(), buf, SNPRINTF_BUF_LEN, "%s", ia32_emit_am(n, env));
 			break;
 		default:
@@ -568,7 +571,6 @@ const char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
 	int               had_output = 0;
 	char              *s;
 	const char        *p;
-	int               size;
 	static struct obstack *obst  = NULL;
 	ir_mode *mode = get_ia32_ls_mode(n);
 
@@ -585,7 +587,7 @@ const char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
 	/* obstack_free with NULL results in an uninitialized obstack */
 	obstack_init(obst);
 
-	p = pointer_size(mode, has_x87_register(n));
+	p = pointer_size(mode, has_x87_register(n) || is_ia32_GetST0(n) || is_ia32_SetST0(n));
 	if (p)
 		obstack_printf(obst, "%s ", p);
 
@@ -638,9 +640,8 @@ const char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
 	if (had_output)
 		obstack_printf(obst, "] ");
 
-	size        = obstack_object_size(obst);
-	s           = obstack_finish(obst);
-	s[size - 1] = '\0';
+	obstack_1grow(obst, '\0');
+	s = obstack_finish(obst);
 
 	return s;
 }
@@ -719,12 +720,12 @@ static const struct cmp2conditon_t cmp2condition_s[] = {
   { "ne",              pn_Cmp_Lg },     /* != */
   { "ordered",         pn_Cmp_Leg },    /* Floating point: ordered */
   { "unordered",       pn_Cmp_Uo },     /* FLoting point: unordered */
-  { "unordered or ==", pn_Cmp_Ue },     /* Floating point: unordered or == */
-  { "unordered or <",  pn_Cmp_Ul },     /* Floating point: unordered or < */
-  { "unordered or <=", pn_Cmp_Ule },    /* Floating point: unordered or <= */
-  { "unordered or >",  pn_Cmp_Ug },     /* Floating point: unordered or > */
-  { "unordered or >=", pn_Cmp_Uge },    /* Floating point: unordered or >= */
-  { "unordered or !=", pn_Cmp_Ne },     /* Floating point: unordered or != */
+  { "e",               pn_Cmp_Ue },     /* Floating point: unordered or == */
+  { "b",               pn_Cmp_Ul },     /* Floating point: unordered or < */
+  { "be",              pn_Cmp_Ule },    /* Floating point: unordered or <= */
+  { "a",               pn_Cmp_Ug },     /* Floating point: unordered or > */
+  { "ae",              pn_Cmp_Uge },    /* Floating point: unordered or >= */
+  { "ne",              pn_Cmp_Ne },     /* Floating point: unordered or != */
   { NULL,              pn_Cmp_True },   /* always true */
 };
 
@@ -741,12 +742,12 @@ static const struct cmp2conditon_t cmp2condition_u[] = {
 	{ "ne",              pn_Cmp_Lg },     /* != */
 	{ "ordered",         pn_Cmp_Leg },    /* Floating point: ordered */
 	{ "unordered",       pn_Cmp_Uo },     /* FLoting point: unordered */
-	{ "unordered or ==", pn_Cmp_Ue },     /* Floating point: unordered or == */
-	{ "unordered or <",  pn_Cmp_Ul },     /* Floating point: unordered or < */
-	{ "unordered or <=", pn_Cmp_Ule },    /* Floating point: unordered or <= */
-	{ "unordered or >",  pn_Cmp_Ug },     /* Floating point: unordered or > */
-	{ "unordered or >=", pn_Cmp_Uge },    /* Floating point: unordered or >= */
-	{ "unordered or !=", pn_Cmp_Ne },     /* Floating point: unordered or != */
+	{ "e",               pn_Cmp_Ue },     /* Floating point: unordered or == */
+	{ "b",               pn_Cmp_Ul },     /* Floating point: unordered or < */
+	{ "be",              pn_Cmp_Ule },    /* Floating point: unordered or <= */
+	{ "a",               pn_Cmp_Ug },     /* Floating point: unordered or > */
+	{ "ae",              pn_Cmp_Uge },    /* Floating point: unordered or >= */
+	{ "ne",              pn_Cmp_Ne },     /* Floating point: unordered or != */
 	{ NULL,              pn_Cmp_True },   /* always true */
 };
 
@@ -814,6 +815,7 @@ static void finish_CondJmp(FILE *F, const ir_node *irn, ir_mode *mode) {
 	char buf[SNPRINTF_BUF_LEN];
 	char cmd_buf[SNPRINTF_BUF_LEN];
 	char cmnt_buf[SNPRINTF_BUF_LEN];
+	int is_unsigned;
 
 	/* get both Proj's */
 	proj1 = get_proj(irn, pn_Cond_true);
@@ -836,16 +838,16 @@ static void finish_CondJmp(FILE *F, const ir_node *irn, ir_mode *mode) {
 	}
 
 	/* the first Proj must always be created */
+	is_unsigned = mode_is_float(mode) || ! mode_is_signed(mode);
 	if (get_Proj_proj(proj1) == pn_Cond_true) {
 		snprintf(cmd_buf, SNPRINTF_BUF_LEN, "j%s %s",
-					get_cmp_suffix(get_ia32_pncode(irn), ! mode_is_signed(get_irn_mode(get_irn_n(irn, 0)))),
+					get_cmp_suffix(get_ia32_pncode(irn), is_unsigned),
 					get_cfop_target(proj1, buf));
 		snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* cmp(a, b) == TRUE */");
 	}
 	else  {
 		snprintf(cmd_buf, SNPRINTF_BUF_LEN, "j%s %s",
-					get_cmp_suffix(get_negated_pnc(get_ia32_pncode(irn), mode),
-					! mode_is_signed(get_irn_mode(get_irn_n(irn, 0)))),
+					get_cmp_suffix(get_negated_pnc(get_ia32_pncode(irn), mode), is_unsigned),
 					get_cfop_target(proj1, buf));
 		snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* cmp(a, b) == FALSE */");
 	}
@@ -949,7 +951,7 @@ static void emit_ia32_xCondJmp(ir_node *irn, ia32_emit_env_t *env) {
 	lc_esnprintf(ia32_get_arg_env(), cmd_buf, SNPRINTF_BUF_LEN, "ucomis%M %s", irn, ia32_emit_binop(irn, env));
 	lc_esnprintf(ia32_get_arg_env(), cmnt_buf, SNPRINTF_BUF_LEN, "/* %+F */", irn);
 	IA32_DO_EMIT(irn);
-	finish_CondJmp(F, irn, get_ia32_res_mode(irn));
+	finish_CondJmp(F, irn, mode_F);
 
 }
 
@@ -1004,7 +1006,9 @@ static void emit_ia32_x87CondJmp(ir_node *irn, ia32_emit_env_t *env) {
 static void CMov_emitter(ir_node *irn, ia32_emit_env_t *env) {
 	FILE               *F       = env->out;
 	const lc_arg_env_t *arg_env = ia32_get_arg_env();
-	const char *cmp_suffix = get_cmp_suffix(get_ia32_pncode(irn), ! mode_is_signed(get_irn_mode(get_irn_n(irn, 0))));
+	ir_mode    *mode       = get_irn_mode(get_irn_n(irn, 0));
+	int        is_unsigned = mode_is_float(mode) || ! mode_is_signed(mode);
+	const char *cmp_suffix = get_cmp_suffix(get_ia32_pncode(irn), is_unsigned);
 	int is_PsiCondCMov     = is_ia32_PsiCondCMov(irn);
 
 	char cmd_buf[SNPRINTF_BUF_LEN];
@@ -1042,7 +1046,7 @@ static void CMov_emitter(ir_node *irn, ia32_emit_env_t *env) {
 		set_irn_n(irn, 2, get_irn_n(irn, 3));
 		set_irn_n(irn, 3, t);
 
-		cmp_suffix = get_cmp_suffix(get_inversed_pnc(get_ia32_pncode(irn)), ! mode_is_signed(get_irn_mode(get_irn_n(irn, 0))));
+		cmp_suffix  = get_cmp_suffix(get_inversed_pnc(get_ia32_pncode(irn)), is_unsigned);
 
 	}
 	else {
@@ -1069,11 +1073,11 @@ static void emit_ia32_xCmpCMov(ir_node *irn, ia32_emit_env_t *env) {
 	CMov_emitter(irn, env);
 }
 
-static void Set_emitter(ir_node *irn, ia32_emit_env_t *env) {
+static void Set_emitter(ir_node *irn, ir_mode *mode, ia32_emit_env_t *env) {
 	FILE               *F       = env->out;
 	const lc_arg_env_t *arg_env = ia32_get_arg_env();
-	const char *cmp_suffix = get_cmp_suffix(get_ia32_pncode(irn), ! mode_is_signed(get_irn_mode(get_irn_n(irn, 0))));
-	const char *instr      = "xor";
+	int        is_unsigned = mode_is_float(mode) || ! mode_is_signed(mode);
+	const char *cmp_suffix = get_cmp_suffix(get_ia32_pncode(irn), is_unsigned);
 	const char *reg8bit;
 
 	char cmd_buf[SNPRINTF_BUF_LEN];
@@ -1083,27 +1087,11 @@ static void Set_emitter(ir_node *irn, ia32_emit_env_t *env) {
 	out     = arch_get_irn_register(env->arch_env, irn);
 	reg8bit = ia32_get_mapped_reg_name(env->isa->regs_8bit, out);
 
-	if (env->isa->opt_arch == arch_pentium_4) {
-		/* P4 prefers sub r, r, others xor r, r */
-		instr = "sub";
-	}
-
-	/* in case of a PsiCondSet use mov because it doesn't affect the eflags */
-	if (is_ia32_PsiCondSet(irn)) {
-		snprintf(cmd_buf, SNPRINTF_BUF_LEN, "mov %%%s, 0", arch_register_get_name(out));
-	}
-	else {
-		snprintf(cmd_buf, SNPRINTF_BUF_LEN, "%s %%%s, %%%s", instr, arch_register_get_name(out), arch_register_get_name(out));
-	}
-
-	snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* clear target as set modifies only lower 8 bit */");
-	IA32_DO_EMIT(irn);
-
 	if (is_ia32_CmpSet(irn)) {
 		lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "cmp %s", ia32_emit_binop(irn, env));
 	}
 	else if (is_ia32_xCmpSet(irn)) {
-		lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "ucomis%M %s", get_irn_n(irn, 0), ia32_emit_binop(irn, env));
+		lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "ucomis%M %s", get_irn_n(irn, 2), ia32_emit_binop(irn, env));
 	}
 	else if (is_ia32_PsiCondSet(irn)) {
 		/* omit compare because flags are already set by And/Or */
@@ -1115,21 +1103,26 @@ static void Set_emitter(ir_node *irn, ia32_emit_env_t *env) {
 	snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* calculate Psi condition */" );
 	IA32_DO_EMIT(irn);
 
+	/* use mov to clear target because it doesn't affect the eflags */
+	snprintf(cmd_buf, SNPRINTF_BUF_LEN, "mov %%%s, 0", arch_register_get_name(out));
+	snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* clear target as set modifies only lower 8 bit */");
+	IA32_DO_EMIT(irn);
+
 	snprintf(cmd_buf, SNPRINTF_BUF_LEN, "set%s %%%s", cmp_suffix, reg8bit);
 	snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* set 1 iff true, 0 otherweise */" );
 	IA32_DO_EMIT(irn);
 }
 
 static void emit_ia32_CmpSet(ir_node *irn, ia32_emit_env_t *env) {
-	Set_emitter(irn, env);
+	Set_emitter(irn, get_irn_mode(get_irn_n(irn, 2)), env);
 }
 
 static void emit_ia32_PsiCondSet(ir_node *irn, ia32_emit_env_t *env) {
-	Set_emitter(irn, env);
+	Set_emitter(irn, get_irn_mode(get_irn_n(irn, 0)), env);
 }
 
 static void emit_ia32_xCmpSet(ir_node *irn, ia32_emit_env_t *env) {
-	Set_emitter(irn, env);
+	Set_emitter(irn, get_irn_mode(get_irn_n(irn, 2)), env);
 }
 
 static void emit_ia32_xCmp(ir_node *irn, ia32_emit_env_t *env) {