X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fbasic-float.cs;h=e85918292c723e4effa596481b6c07485d105c8d;hb=7ea732a51cdd7edbd5488c630245d594142aa1b7;hp=fb731f687789ef1547c1504cd5221dba3eab6fde;hpb=669beaed8380fa592533c8755f72593b4422d01d;p=mono.git

diff --git a/mono/mini/basic-float.cs b/mono/mini/basic-float.cs
index fb731f68778..e85918292c7 100644
--- a/mono/mini/basic-float.cs
+++ b/mono/mini/basic-float.cs
@@ -6,7 +6,7 @@ using System.Reflection;
  *
  * Each test needs to be of the form:
  *
- * static int test_<result>_<name> ();
+ * public static int test_<result>_<name> ();
  *
  * where <result> is an integer (the value that needs to be returned by
  * the method to make it pass.
@@ -23,34 +23,44 @@ using System.Reflection;
  * the IL code looks.
  */
 
-class Tests {
+/* A comparison made to same variable. */
+#pragma warning disable 1718
 
-	static int Main () {
-		return TestDriver.RunTests (typeof (Tests));
+#if MOBILE
+class FloatTests
+#else
+class Tests
+#endif
+{
+
+#if !MOBILE
+	public static int Main (string[] args) {
+		return TestDriver.RunTests (typeof (Tests), args);
 	}
+#endif
 	
-	static int test_0_beq () {
+	public static int test_0_beq () {
 		double a = 2.0;
 		if (a != 2.0)
 			return 1;
 		return 0;
 	}
 
-	static int test_0_bne_un () {
+	public static int test_0_bne_un () {
 		double a = 2.0;
 		if (a == 1.0)
 			return 1;
 		return 0;
 	}
 
-	static int test_0_conv_r8 () {
+	public static int test_0_conv_r8 () {
 		double a = 2;
 		if (a != 2.0)
 			return 1;
 		return 0;
 	}
 
-	static int test_0_conv_i () {
+	public static int test_0_conv_i () {
 		double a = 2.0;
 		int i = (int)a;
 		if (i != 2)
@@ -70,69 +80,89 @@ class Tests {
 		sbyte sb = (sbyte)a;
 		if (sb != 2)
 			return 6;
+		/* MS.NET special cases these */
+		double d = Double.NaN;
+		ui = (uint)d;
+		if (ui != 0)
+			return 7;
+		d = Double.PositiveInfinity;
+		ui = (uint)d;
+		if (ui != 0)
+			return 8;
+		d = Double.NegativeInfinity;
+		ui = (uint)d;
+		if (ui != 0)
+			return 9;
+
 		return 0;
 	}
 
-	static int test_5_conv_r4 () {
+	public static int test_5_conv_r4 () {
 		int i = 5;
 		float f = (float)i;
 		return (int)f;
 	}
 
-	static int test_5_double_conv_r4 () {
+	public static int test_0_conv_r4_m1 () {
+		int i = -1;
+		float f = (float)i;
+		return (int)f + 1;
+	}
+
+	public static int test_5_double_conv_r4 () {
 		double d = 5.0;
 		float f = (float)d;
 		return (int)f;
 	}
 
-	static int test_5_float_conv_r8 () {
+	public static int test_5_float_conv_r8 () {
 		float f = 5.0F;
 		double d = (double)f;
 		return (int)d;
 	}
 
-	static int test_5_conv_r8 () {
+	public static int test_5_conv_r8 () {
 		int i = 5;
 		double f = (double)i;
 		return (int)f;
 	}
 
-	static int test_5_add () {
+	public static int test_5_add () {
 		double a = 2.0;
 		double b = 3.0;		
 		return (int)(a + b);
 	}
 
-	static int test_5_sub () {
+	public static int test_5_sub () {
 		double a = 8.0;
 		double b = 3.0;		
 		return (int)(a - b);
 	}	
 
-	static int test_24_mul () {
+	public static int test_24_mul () {
 		double a = 8.0;
 		double b = 3.0;		
 		return (int)(a * b);
 	}	
 
-	static int test_4_div () {
+	public static int test_4_div () {
 		double a = 8.0;
 		double b = 2.0;		
 		return (int)(a / b);
 	}	
 
-	static int test_2_rem () {
+	public static int test_2_rem () {
 		double a = 8.0;
 		double b = 3.0;		
 		return (int)(a % b);
 	}	
 
-	static int test_2_neg () {
+	public static int test_2_neg () {
 		double a = -2.0;		
 		return (int)(-a);
 	}
 	
-	static int test_46_float_add_spill () {
+	public static int test_46_float_add_spill () {
 		// we overflow the FP stack
 		double a = 1;
 		double b = 2;
@@ -147,7 +177,7 @@ class Tests {
 		return (int)(1.0 + (a + (b + (c + (d + (e + (f + (g + (h + i)))))))));
 	}
 
-	static int test_4_float_sub_spill () {
+	public static int test_4_float_sub_spill () {
 		// we overflow the FP stack
 		double a = 1;
 		double b = 2;
@@ -163,7 +193,7 @@ class Tests {
 		////// -(int)(1.0 - (1 - (2 - (3 - (4 - (5 - (6 - (7 - (8 - 9)))))))));
 	}
 
-	static int test_362880_float_mul_spill () {
+	public static int test_362880_float_mul_spill () {
 		// we overflow the FP stack
 		double a = 1;
 		double b = 2;
@@ -178,7 +208,7 @@ class Tests {
 		return (int)(1.0 * (a * (b * (c * (d * (e * (f * (g * (h * i)))))))));
 	}
 
-	static int test_4_long_cast () {
+	public static int test_4_long_cast () {
 		long a = 1000;
 		double d = (double)a;
 		long b = (long)d;
@@ -192,7 +222,20 @@ class Tests {
 		return 4;
 	}
 
-	static int test_4_single_long_cast () {
+	public static int test_4_ulong_cast () {
+		ulong a = 1000;
+		double d = (double)a;
+		ulong b = (ulong)d;
+		if (b != 1000)
+			return 0;
+		a = 0xffffffffffffffff;
+		float f = (float)a;
+		if (!(f > 0f))
+			return 1;
+		return 4;
+	}
+
+	public static int test_4_single_long_cast () {
 		long a = 1000;
 		float d = (float)a;
 		long b = (long)d;
@@ -206,6 +249,36 @@ class Tests {
 		return 4;
 	}
 
+	public static int test_0_lconv_to_r8 () {
+		long a = 150;
+		double b = (double) a;
+
+		if (b != 150.0)
+			return 1;
+		return 0;
+	}
+
+	public static int test_0_lconv_to_r4 () {
+		long a = 3000;
+		float b = (float) a;
+
+		if (b != 3000.0F)
+			return 1;
+		return 0;
+	}
+
+	static void doit (double value, out long m) {
+		m = (long) value;
+	}
+
+	public static int test_0_ftol_clobber () {
+		long m;
+		doit (1.3, out m);
+		if (m != 1)
+			return 2;
+		return 0;
+	}
+
 	public static int test_0_rounding () {
 		long ticks = 631502475130080000L;
 		long ticksperday = 864000000000L;
@@ -239,7 +312,7 @@ class Tests {
 	}
 	*/
 
-	static int test_16_float_cmp () {
+	public static int test_16_float_cmp () {
 		double a = 2.0;
 		double b = 1.0;
 		int result = 0;
@@ -328,7 +401,7 @@ class Tests {
 		return result;
 	}
 
-	static int test_15_float_cmp_un () {
+	public static int test_15_float_cmp_un () {
 		double a = Double.NaN;
 		double b = 1.0;
 		int result = 0;
@@ -412,7 +485,7 @@ class Tests {
 		return result;
 	}
 
-	static int test_15_float_branch () {
+	public static int test_15_float_branch () {
 		double a = 2.0;
 		double b = 1.0;
 		int result = 0;
@@ -480,7 +553,7 @@ class Tests {
 		return result;
 	}
 
-	static int test_15_float_branch_un () {
+	public static int test_15_float_branch_un () {
 		double a = Double.NaN;
 		double b = 1.0;
 		int result = 0;
@@ -548,7 +621,7 @@ class Tests {
 		return result;
 	}
 
-	static int test_0_float_precision () {
+	public static int test_0_float_precision () {
 		float f1 = 3.40282346638528859E+38f;
 		float f2 = 3.40282346638528859E+38f;		
 		float PositiveInfinity =  1.0f / 0.0f;
@@ -556,5 +629,46 @@ class Tests {
 
 		return f == PositiveInfinity ? 0 : 1;
 	}
+
+	static double VALUE = 0.19975845134874831D;
+
+	public static int test_0_float_conversion_reduces_double_precision () {
+		double d = (float)VALUE;
+		if (d != 0.19975845515727997d)
+			return 1;
+
+		return 0;
+	}
+
+
+    public static int test_0_long_to_double_conversion ()
+    {
+		long l = 9223372036854775807L;
+		long conv = (long)((double)l);
+		if (conv != -9223372036854775808L)
+			return 1;
+
+		return 0;
+    }
+
+	public static int INT_VAL = 0x13456799;
+
+	public static int test_0_int4_to_float_convertion ()
+    {
+		double d = (double)(float)INT_VAL;
+
+		if (d != 323315616)
+			return 1;
+		return 0;
+	}
+
+	public static int test_0_int8_to_float_convertion ()
+    {
+		double d = (double)(float)(long)INT_VAL;
+
+		if (d != 323315616)
+			return 1;
+		return 0;
+	}
 }