X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fbasic.cs;h=b700efa87e39503de0291560b09a388d4600241e;hb=7f23a0c1f3b357cea793f429b52a918f45157855;hp=9d87228509a2dbc7bb72542dde387c63c7a3e2cb;hpb=0f01ef3e59e495b8fd69a0fbace0a26bfb95e62d;p=mono.git

diff --git a/mono/mini/basic.cs b/mono/mini/basic.cs
index 9d87228509a..b700efa87e3 100644
--- a/mono/mini/basic.cs
+++ b/mono/mini/basic.cs
@@ -190,6 +190,16 @@ class Tests {
 		return b % 8;
 	}
 
+	public static int test_0_rem_imm_0 () {
+		int b = 12;
+		return b % 1;
+	}
+
+	public static int test_0_rem_imm_0_neg () {
+		int b = -2;
+		return b % 1;
+	}
+
 	public static int test_4_rem_big_imm () {
 		int b = 10004;
 		return b % 10000;
@@ -675,7 +685,21 @@ class Tests {
 			return 1;
 		else
 			return 0;
-	}		
+	}
+
+	public static int test_127_iconv_to_i1 () {
+		int i = 0x100017f;
+		sbyte s = (sbyte)i;
+
+		return s;
+	}
+
+	public static int test_384_iconv_to_i2 () {
+		int i = 0x1000180;
+		short s = (short)i;
+
+		return s;
+	}
 	
 	public static int test_15_for_loop () {
 		int i;
@@ -1216,8 +1240,9 @@ class Tests {
 
 		// Avoid cfolding this
 		i = 0;
-		for (int j = 0; j < 1234567; ++j)
+		for (int j = 0; j < 567; ++j)
 			i ++;
+		i += 1234000;
 		if ((i / 2) != 617283)
 			return 1;
 		if ((i / 4) != 308641)
@@ -1229,8 +1254,9 @@ class Tests {
 
 		// Avoid cfolding this
 		i = 0;
-		for (int j = 0; j < 1234567; ++j)
+		for (int j = 0; j < 567; ++j)
 			i --;
+		i -= 1234000;
 		if ((i / 2) != -617283)
 			return 5;
 		if ((i / 4) != -308641)
@@ -1274,4 +1300,65 @@ class Tests {
 
 		return 0;
 	}
-}
+
+	public static int cmov (int i) {
+		int j = 0;
+
+		if (i > 0)
+			j = 1;
+
+		return j;
+	}
+
+	public static int cmov2 (int i) {
+		int j = 0;
+
+		if (i <= 0)
+			;
+		else
+			j = 1;
+
+		return j;
+	}
+		
+	public static int test_0_branch_to_cmov_opt () {
+		if (cmov (0) != 0)
+			return 1;
+		if (cmov (1) != 1)
+			return 2;
+		if (cmov2 (0) != 0)
+			return 1;
+		if (cmov2 (1) != 1)
+			return 2;
+		return 0;
+	}
+
+	public static unsafe int test_0_ishr_sign_extend () {
+		// Check that ishr does sign extension from bit 31 on 64 bit platforms
+		uint val = 0xF0000000u;
+
+		uint *a = &val;
+		uint ui = (uint)((int)(*a) >> 2);
+
+		if (ui != 0xfc000000)
+			return 1;
+
+		// Same with non-immediates
+		int amount = 2;
+
+		ui = (uint)((int)(*a) >> amount);
+
+		if (ui != 0xfc000000)
+			return 2;
+
+		return 0;
+	}
+
+	public static unsafe int test_0_ishr_sign_extend_cfold () {
+		int i = 32768;
+		int j = i << 16;
+		int k = j >> 16;
+
+		return k == -32768 ? 0 : 1;
+	}
+}
\ No newline at end of file