X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fbearch_ia32.c;h=1db15bf5b0a66ff46c95b909ebf5f9d9d55b755b;hb=577e990a5c85673d69ff5eee46d438be2bf50f44;hp=684d51a1b2bd0da32adfea6669c555c3b980ee94;hpb=526d469f1f5deb24bba9f6af4c1804dca5ec287b;p=libfirm

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index 684d51a1b..1db15bf5b 100644
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -486,7 +486,6 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
 	if (env->flags.try_omit_fp) {
 		/* simply remove the stack frame here */
 		curr_sp = be_new_IncSP(arch_env->sp, irg, bl, curr_sp, BE_STACK_FRAME_SIZE_SHRINK, 0);
-		add_irn_dep(curr_sp, *mem);
 	} else {
 		ir_mode *mode_bp = arch_env->bp->reg_class->mode;
 
@@ -630,9 +629,10 @@ static int ia32_get_op_estimated_cost(const ir_node *irn)
 			(we assume they are in cache), other memory operations cost 20
 			cycles.
 		*/
-		if(is_ia32_use_frame(irn) ||
-				(is_ia32_NoReg_GP(get_irn_n(irn, 0)) &&
-		         is_ia32_NoReg_GP(get_irn_n(irn, 1)))) {
+		if (is_ia32_use_frame(irn) || (
+		    	is_ia32_NoReg_GP(get_irn_n(irn, n_ia32_base)) &&
+		    	is_ia32_NoReg_GP(get_irn_n(irn, n_ia32_index))
+		    )) {
 			cost += 5;
 		} else {
 			cost += 20;
@@ -839,6 +839,9 @@ static int ia32_possible_memory_operand(const ir_node *irn, unsigned int i) {
 static void ia32_perform_memory_operand(ir_node *irn, ir_node *spill,
                                         unsigned int i)
 {
+	ir_mode *load_mode;
+	ir_mode *dest_op_mode;
+
 	ia32_code_gen_t *cg = ia32_current_cg;
 
 	assert(ia32_possible_memory_operand(irn, i) && "Cannot perform memory operand change");
@@ -848,13 +851,19 @@ static void ia32_perform_memory_operand(ir_node *irn, ir_node *spill,
 	}
 
 	set_ia32_op_type(irn, ia32_AddrModeS);
-	set_ia32_ls_mode(irn, get_irn_mode(get_irn_n(irn, i)));
+
+	load_mode    = get_irn_mode(get_irn_n(irn, i));
+	dest_op_mode = get_ia32_ls_mode(irn);
+	if (get_mode_size_bits(load_mode) <= get_mode_size_bits(dest_op_mode)) {
+		set_ia32_ls_mode(irn, load_mode);
+	}
 	set_ia32_use_frame(irn);
 	set_ia32_need_stackent(irn);
 
 	set_irn_n(irn, n_ia32_base, get_irg_frame(get_irn_irg(irn)));
 	set_irn_n(irn, n_ia32_binary_right, ia32_get_admissible_noreg(cg, irn, n_ia32_binary_right));
 	set_irn_n(irn, n_ia32_mem, spill);
+	set_ia32_is_reload(irn);
 
 	/* immediates are only allowed on the right side */
 	if (i == n_ia32_binary_left && is_ia32_Immediate(get_irn_n(irn, n_ia32_binary_left))) {
@@ -1425,7 +1434,11 @@ static void ia32_collect_frame_entity_nodes(ir_node *node, void *data)
 		if (is_ia32_need_stackent(node) || is_ia32_Load(node)) {
 			const ir_mode     *mode  = get_ia32_ls_mode(node);
 			const ia32_attr_t *attr  = get_ia32_attr_const(node);
-			int                align = get_mode_size_bytes(mode);
+			int                align;
+
+			if (is_ia32_is_reload(node)) {
+				mode = get_spill_mode_mode(mode);
+			}
 
 			if(attr->data.need_64bit_stackent) {
 				mode = mode_Ls;
@@ -1433,6 +1446,7 @@ static void ia32_collect_frame_entity_nodes(ir_node *node, void *data)
 			if(attr->data.need_32bit_stackent) {
 				mode = mode_Is;
 			}
+			align = get_mode_size_bytes(mode);
 			be_node_needs_frame_entity(env, node, mode, align);
 		} else if (is_ia32_vfild(node) || is_ia32_xLoad(node)
 		           || is_ia32_vfld(node)) {
@@ -1877,8 +1891,7 @@ static void ia32_get_call_abi(const void *self, ir_type *method_type,
 		cc = cc_cdecl_set;
 	} else {
 		cc = get_method_calling_convention(method_type);
-		if (!(cc & cc_fixed)                                                     &&
-		    get_method_additional_properties(method_type) & mtp_property_private &&
+		if (get_method_additional_properties(method_type) & mtp_property_private &&
 		    ia32_cg_config.optimize_cc) {
 			/* set the calling conventions to register parameter */
 			cc = (cc & ~cc_bits) | cc_reg_param;