X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fcodegen-common.cpp;h=5536ba819c29871a28a64885a8905814e161f586;hp=9dc00a90bc10f91ff7d1d637f16b88be837bd65c;hb=735bdda890a385d1fa9cc532faadbbc96f2d1218;hpb=a40fe595d0cfe6c65922418de174200ce4873633

diff --git a/src/vm/jit/codegen-common.cpp b/src/vm/jit/codegen-common.cpp
index 9dc00a90b..5536ba819 100644
--- a/src/vm/jit/codegen-common.cpp
+++ b/src/vm/jit/codegen-common.cpp
@@ -1356,9 +1356,13 @@ bool codegen_emit(jitdata *jd)
 			case ICMD_IMUL:       /* ..., val1, val2  ==> ..., val1 * val2    */
 			case ICMD_IMULCONST:  /* ..., value  ==> ..., value * constant    */
 			                      /* sx.val.i = constant                      */
+			case ICMD_IMULPOW2:   /* ..., value  ==> ..., value * (2 ^ constant) */
+			                      /* sx.val.i = constant                      */
 			case ICMD_LMUL:       /* ..., val1, val2  ==> ..., val1 * val2    */
 			case ICMD_LMULCONST:  /* ..., value  ==> ..., value * constant    */
 			                      /* sx.val.l = constant                      */
+			case ICMD_LMULPOW2:   /* ..., value  ==> ..., value * (2 ^ constant) */
+			                      /* sx.val.l = constant                      */
 			case ICMD_IDIV:       /* ..., val1, val2  ==> ..., val1 / val2    */
 			case ICMD_IREM:       /* ..., val1, val2  ==> ..., val1 % val2    */
 			case ICMD_IDIVPOW2:   /* ..., value  ==> ..., value >> constant   */
@@ -1535,7 +1539,6 @@ bool codegen_emit(jitdata *jd)
 				/* This approach is much faster than moving the field
 				   address inline into a register. */
 
-				// XXX ARM: M_DSEG_LOAD(REG_ITMP3, disp);
 				M_ALD_DSEG(REG_ITMP1, disp);
 
 				switch (fieldtype) {
@@ -1599,7 +1602,6 @@ bool codegen_emit(jitdata *jd)
 				/* This approach is much faster than moving the field
 				   address inline into a register. */
 
-				// XXX ARM: M_DSEG_LOAD(REG_ITMP3, disp);
 				M_ALD_DSEG(REG_ITMP1, disp);
 
 				switch (fieldtype) {
@@ -1857,16 +1859,22 @@ bool codegen_emit(jitdata *jd)
 
 				REPLACEMENT_POINT_RETURN(cd, iptr);
 				s1 = emit_load_s1(jd, iptr, REG_FRESULT);
-				// XXX ARM: Here this was M_CAST_F2I(s1, REG_RESULT);
+#if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
 				emit_fmove(cd, s1, REG_FRESULT);
+#else
+				M_CAST_F2I(s1, REG_RESULT);
+#endif
 				goto nowperformreturn;
 
 			case ICMD_DRETURN:    /* ..., retvalue ==> ...                    */
 
 				REPLACEMENT_POINT_RETURN(cd, iptr);
 				s1 = emit_load_s1(jd, iptr, REG_FRESULT);
-				// XXX ARM: Here this was M_CAST_D2L(s1, REG_RESULT_PACKED);
+#if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
 				emit_dmove(cd, s1, REG_FRESULT);
+#else
+				M_CAST_D2L(s1, REG_LRESULT);
+#endif
 				goto nowperformreturn;
 
 nowperformreturn:
@@ -1972,36 +1980,36 @@ gen_method:
 						continue;
 
 					if (!md->params[i].inmemory) {
-						assert(ARG_CNT > 0);
-						s1 = emit_load(jd, iptr, var, d);
-
 						switch (var->type) {
 						case TYPE_ADR:
 						case TYPE_INT:
-							assert(INT_ARG_CNT > 0);
+							s1 = emit_load(jd, iptr, var, d);
 							emit_imove(cd, s1, d);
 							break;
 
-#if 0 //XXX For ARM:
-if (!md->params[s3].inmemory) {
-	s1 = emit_load(jd, iptr, var, REG_FTMP1);
-	if (IS_2_WORD_TYPE(var->type))
-		M_CAST_D2L(s1, d);
-	else
-		M_CAST_F2I(s1, d);
-}
-#endif //XXX End of ARM!
-
 						case TYPE_LNG:
+							s1 = emit_load(jd, iptr, var, d);
 							emit_lmove(cd, s1, d);
 							break;
 
 						case TYPE_FLT:
+#if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
+							s1 = emit_load(jd, iptr, var, d);
 							emit_fmove(cd, s1, d);
+#else
+							s1 = emit_load(jd, iptr, var, REG_FTMP1);
+							M_CAST_F2I(s1, d);
+#endif
 							break;
 
 						case TYPE_DBL:
+#if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
+							s1 = emit_load(jd, iptr, var, d);
 							emit_dmove(cd, s1, d);
+#else
+							s1 = emit_load(jd, iptr, var, REG_FTMP1);
+							M_CAST_D2L(s1, d);
+#endif
 							break;
 						}
 					}
@@ -2089,27 +2097,25 @@ if (!md->params[s3].inmemory) {
 					emit_store_dst(jd, iptr, s1);
 					break;
 
-#if 0 //XXX For ARM!!!
-#if !defined(ENABLE_SOFTFLOAT)
-				} else {
-					s1 = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
-					if (IS_2_WORD_TYPE(d))
-						M_CAST_L2D(REG_RESULT_PACKED, s1);
-					else
-						M_CAST_I2F(REG_RESULT, s1);
-				}
-#endif /* !defined(ENABLE_SOFTFLOAT) */
-#endif //XXX End of ARM
-
 				case TYPE_FLT:
+#if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
 					s1 = codegen_reg_of_dst(jd, iptr, REG_FRESULT);
 					emit_fmove(cd, REG_FRESULT, s1);
+#else
+					s1 = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
+					M_CAST_I2F(REG_RESULT, s1);
+#endif
 					emit_store_dst(jd, iptr, s1);
 					break;
 
 				case TYPE_DBL:
+#if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
 					s1 = codegen_reg_of_dst(jd, iptr, REG_FRESULT);
 					emit_dmove(cd, REG_FRESULT, s1);
+#else
+					s1 = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
+					M_CAST_L2D(REG_LRESULT, s1);
+#endif
 					emit_store_dst(jd, iptr, s1);
 					break;