X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fia32%2Fia32_transform.c;h=90d6993ab36ac2dce04f6a3ea1c56c320a67d732;hb=f9a010d893d700bd120cf8b96c1772e7c6f4d92e;hp=83ae6d8f16c8c0df143e60dc60634b0c979b6a62;hpb=431291ca9f9415e852e2af5ee425bcb7f576ebaa;p=libfirm

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 83ae6d8f1..90d6993ab 100644
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -25,6 +25,8 @@
 #include "irprintf.h"
 #include "debug.h"
 #include "irdom.h"
+#include "type.h"
+#include "entity.h"
 #include "archop.h"     /* we need this for Min and Max nodes */
 
 #include "../benode_t.h"
@@ -2328,42 +2330,50 @@ static ir_node *gen_be_Call(ia32_transform_env_t *env) {
 static ir_node *gen_be_Return(ia32_transform_env_t *env) {
 	ir_node *ret_val = get_irn_n(env->irn, be_pos_Return_val);
 	ir_node *ret_mem = get_irn_n(env->irn, be_pos_Return_mem);
-	ir_mode *mode;
+	entity *ent      = get_irg_entity(get_irn_irg(ret_val));
+	ir_type *tp      = get_entity_type(ent);
 
-	if (! ret_val || ! USE_SSE2(env->cg))
+	if (be_Return_get_n_rets(env->irn) < 1 || ! ret_val || ! USE_SSE2(env->cg))
 		return NULL;
 
-	mode = get_irn_mode(ret_val);
 
-	if (mode_is_float(mode)) {
-		ir_node *frame = get_irg_frame(env->irg);
-		entity  *ent   = frame_alloc_area(get_irg_frame_type(env->irg), get_mode_size_bytes(mode), 16, 0);
-		ir_node *sse_store, *fld, *mproj;
-
-		/* store xmm0 onto stack */
-		sse_store = new_rd_ia32_xStoreSimple(env->dbg, env->irg, env->block, frame, ret_val, ret_mem);
-		set_ia32_ls_mode(sse_store, mode);
-		set_ia32_op_type(sse_store, ia32_AddrModeD);
-		set_ia32_use_frame(sse_store);
-		set_ia32_frame_ent(sse_store, ent);
-		set_ia32_am_flavour(sse_store, ia32_B);
-		set_ia32_am_support(sse_store, ia32_am_Dest);
-		sse_store = new_r_Proj(env->irg, env->block, sse_store, mode_M, pn_ia32_xStore_M);
-
-		/* load into st0 */
-		fld = new_rd_ia32_SetST0(env->dbg, env->irg, env->block, frame, sse_store);
-		set_ia32_ls_mode(fld, mode);
-		set_ia32_op_type(fld, ia32_AddrModeS);
-		set_ia32_use_frame(fld);
-		set_ia32_frame_ent(fld, ent);
-		set_ia32_am_flavour(fld, ia32_B);
-		set_ia32_am_support(fld, ia32_am_Source);
-		mproj = new_r_Proj(env->irg, env->block, fld, mode_M, pn_ia32_SetST0_M);
-		fld   = new_r_Proj(env->irg, env->block, fld, mode, pn_ia32_SetST0_res);
-
-		/* set new return value */
-		set_irn_n(env->irn, be_pos_Return_val, fld);
-		set_irn_n(env->irn, be_pos_Return_mem, mproj);
+	if (get_method_n_ress(tp) == 1) {
+		ir_type *res_type = get_method_res_type(tp, 0);
+		ir_mode *mode;
+
+		if(is_Primitive_type(res_type)) {
+			mode = get_type_mode(res_type);
+			if(mode_is_float(mode)) {
+				ir_node *frame = get_irg_frame(env->irg);
+				entity  *ent   = frame_alloc_area(get_irg_frame_type(env->irg), get_mode_size_bytes(mode), 16, 0);
+				ir_node *sse_store, *fld, *mproj;
+
+				/* store xmm0 onto stack */
+				sse_store = new_rd_ia32_xStoreSimple(env->dbg, env->irg, env->block, frame, ret_val, ret_mem);
+				set_ia32_ls_mode(sse_store, mode);
+				set_ia32_op_type(sse_store, ia32_AddrModeD);
+				set_ia32_use_frame(sse_store);
+				set_ia32_frame_ent(sse_store, ent);
+				set_ia32_am_flavour(sse_store, ia32_B);
+				set_ia32_am_support(sse_store, ia32_am_Dest);
+				sse_store = new_r_Proj(env->irg, env->block, sse_store, mode_M, pn_ia32_xStore_M);
+
+				/* load into st0 */
+				fld = new_rd_ia32_SetST0(env->dbg, env->irg, env->block, frame, sse_store);
+				set_ia32_ls_mode(fld, mode);
+				set_ia32_op_type(fld, ia32_AddrModeS);
+				set_ia32_use_frame(fld);
+				set_ia32_frame_ent(fld, ent);
+				set_ia32_am_flavour(fld, ia32_B);
+				set_ia32_am_support(fld, ia32_am_Source);
+				mproj = new_r_Proj(env->irg, env->block, fld, mode_M, pn_ia32_SetST0_M);
+				fld   = new_r_Proj(env->irg, env->block, fld, mode, pn_ia32_SetST0_res);
+
+				/* set new return value */
+				set_irn_n(env->irn, be_pos_Return_val, fld);
+				set_irn_n(env->irn, be_pos_Return_mem, mproj);
+			}
+		}
 	}
 
 	return NULL;