X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_x87.c;h=60e12285a42b6e2ab4d8c1754ce1eef11c0fd02f;hb=e86f1bc36650e0978d66ffb5fcd347a525840655;hp=ddbe7c25e4afa9c9846928d1ac9de0eef649c4af;hpb=315a59bbfad17fd53d212e6843fec0375b9c0c32;p=libfirm

diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c
index ddbe7c25e..60e12285a 100644
--- a/ir/be/ia32/ia32_x87.c
+++ b/ir/be/ia32/ia32_x87.c
@@ -44,7 +44,7 @@
 #include "error.h"
 
 #include "../belive_t.h"
-#include "../besched_t.h"
+#include "../besched.h"
 #include "../benode_t.h"
 #include "bearch_ia32_t.h"
 #include "ia32_new_nodes.h"
@@ -413,12 +413,12 @@ static ir_node *x87_patch_insn(ir_node *n, ir_op *op)
 				mode = get_irn_mode(proj);
 				if (mode_is_float(mode)) {
 					res = proj;
-					set_irn_mode(proj, mode_E);
+					set_irn_mode(proj, ia32_reg_classes[CLASS_ia32_st].mode);
 				}
 			}
 		}
 	} else if (mode_is_float(mode))
-		set_irn_mode(n, mode_E);
+		set_irn_mode(n, ia32_reg_classes[CLASS_ia32_st].mode);
 	return res;
 }  /* x87_patch_insn */
 
@@ -739,7 +739,7 @@ static ir_node *x87_create_fldz(x87_state *state, ir_node *n, int regidx)
 	ir_node *block = get_nodes_block(n);
 	ir_node *fldz;
 
-	fldz = new_bd_ia32_fldz(NULL, block, mode_E);
+	fldz = new_bd_ia32_fldz(NULL, block, ia32_reg_classes[CLASS_ia32_st].mode);
 
 	sched_add_before(n, fldz);
 	DB((dbg, LEVEL_1, "<<< %s\n", get_irn_opname(fldz)));
@@ -1234,13 +1234,14 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p)
 
 	if (live_after_node) {
 		/*
-			Problem: fst doesn't support mode_E (spills), only fstp does
+			Problem: fst doesn't support 96bit modes (spills), only fstp does
+			         fist doesn't support 64bit mode, only fistp
 			Solution:
 				- stack not full: push value and fstp
 				- stack full: fstp value and load again
 			Note that we cannot test on mode_E, because floats might be 96bit ...
 		*/
-		if (get_mode_size_bits(mode) > 64 || mode == mode_Ls) {
+		if (get_mode_size_bits(mode) > 64 || (mode_is_int(mode) && get_mode_size_bits(mode) > 32)) {
 			if (depth < N_x87_REGS) {
 				/* ok, we have a free register: push + fstp */
 				x87_create_fpush(state, n, op2_idx, n_ia32_vfst_val);
@@ -1266,9 +1267,8 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p)
 				set_ia32_am_sc(vfld, get_ia32_am_sc(n));
 				set_ia32_ls_mode(vfld, get_ia32_ls_mode(n));
 
-				irg   = get_irn_irg(n);
-				rproj = new_r_Proj(irg, block, vfld, get_ia32_ls_mode(vfld), pn_ia32_vfld_res);
-				mproj = new_r_Proj(irg, block, vfld, mode_M, pn_ia32_vfld_M);
+				rproj = new_r_Proj(block, vfld, get_ia32_ls_mode(vfld), pn_ia32_vfld_res);
+				mproj = new_r_Proj(block, vfld, mode_M, pn_ia32_vfld_M);
 				mem   = get_irn_Proj_for_mode(n, mode_M);
 
 				assert(mem && "Store memory not found");
@@ -1276,6 +1276,7 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p)
 				arch_set_irn_register(rproj, op2);
 
 				/* reroute all former users of the store memory to the load memory */
+				irg = get_irn_irg(n);
 				edges_reroute(mem, mproj, irg);
 				/* set the memory input of the load to the store memory */
 				set_irn_n(vfld, n_ia32_vfld_mem, mem);
@@ -1293,7 +1294,7 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p)
 			if (op2_idx != 0)
 				x87_create_fxch(state, n, op2_idx);
 
-			/* mode != mode_E -> use normal fst */
+			/* mode size 64 or smaller -> use normal fst */
 			x87_patch_insn(n, op);
 		}
 	} else {
@@ -1733,12 +1734,11 @@ static int sim_Keep(x87_state *state, ir_node *node)
  */
 static void keep_float_node_alive(ir_node *node)
 {
-	ir_graph                    *irg    = get_irn_irg(node);
 	ir_node                     *block  = get_nodes_block(node);
 	const arch_register_class_t *cls    = arch_get_irn_reg_class_out(node);
 	ir_node                     *keep;
 
-	keep = be_new_Keep(cls, irg, block, 1, &node);
+	keep = be_new_Keep(cls, block, 1, &node);
 
 	assert(sched_is_scheduled(node));
 	sched_add_after(node, keep);
@@ -2150,7 +2150,7 @@ static int sim_Barrier(x87_state *state, ir_node *node)
 
 		/* create a zero */
 		block = get_nodes_block(node);
-		zero  = new_bd_ia32_fldz(NULL, block, mode_E);
+		zero  = new_bd_ia32_fldz(NULL, block, ia32_reg_classes[CLASS_ia32_st].mode);
 		x87_push(state, arch_register_get_index(reg), zero);
 
 		attr = get_ia32_x87_attr(zero);
@@ -2277,7 +2277,7 @@ static void fix_unknown_phis(x87_state *state, ir_node *block,
 		reg = arch_get_irn_register(phi);
 
 		/* create a zero at end of pred block */
-		zero = new_bd_ia32_fldz(NULL, pred_block, mode_E);
+		zero = new_bd_ia32_fldz(NULL, pred_block, ia32_reg_classes[CLASS_ia32_st].mode);
 		x87_push(state, arch_register_get_index(reg), zero);
 
 		attr = get_ia32_x87_attr(zero);