Fix the build.

[mono.git] / mono / mini / basic.cs

diff --git a/mono/mini/basic.cs b/mono/mini/basic.cs
index 7f349f2ab388a31581e9c1805d1c28b93250965d..477af333e9b4a8401a8b6ec5ab4e7646e6044ac3 100644 (file)
--- a/mono/mini/basic.cs
+++ b/mono/mini/basic.cs
@@ -23,11 +23,18 @@ using System.Reflection;
  * the IL code looks.
  */
 
-class Tests {
-
-       static int Main () {
-               return TestDriver.RunTests (typeof (Tests));
-       }
+#if MOBILE
+class BasicTests
+#else
+class Tests
+#endif
+{
+
+#if !MOBILE
+       public static int Main (string[] args) {
+               return TestDriver.RunTests (typeof (Tests), args);
+       }
+#endif
        
        public static int test_0_return () {
                return 0;
@@ -195,6 +202,11 @@ class Tests {
                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;
@@ -1235,8 +1247,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)
@@ -1248,8 +1261,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)
@@ -1326,19 +1340,32 @@ class Tests {
                return 0;
        }
 
-       //repro for #506915
-       struct Bug506915 { public int val; }
-       static int test_2_ldobj_stobj_optization (string[] args)
-       {
-               int i = 99;
-               var a = new Bug506915 ();
-               var b = new Bug506915 ();
-               if (i.GetHashCode () == 99)
-                       i = 44;
-               var array = new Bug506915 [2];
-               array [0].val = 2;
-               array [1] = (i == 0) ? a : array [0];
-               
-               return array [1].val;
+       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;
        }
 }