Update to the latest version of the LLVM mono branch.

[mono.git] / mono / mini / jit-icalls.c

diff --git a/mono/mini/jit-icalls.c b/mono/mini/jit-icalls.c
index fd1de882efff4dae1fadada00b49555dc741d9f9..578cc35c1026841f43c1dda666ebf2e3bc2b230b 100644 (file)
--- a/mono/mini/jit-icalls.c
+++ b/mono/mini/jit-icalls.c
@@ -74,6 +74,8 @@ mono_helper_stelem_ref_check (MonoArray *array, MonoObject *val)
 {
        MONO_ARCH_SAVE_REGS;
 
+       if (!array)
+               mono_raise_exception (mono_get_exception_null_reference ());
        if (val && !mono_object_isinst (val, array->obj.vtable->klass->element_class))
                mono_raise_exception (mono_get_exception_array_type_mismatch ());
 }
@@ -241,7 +243,7 @@ mono_idiv (gint32 a, gint32 b)
        if (!b)
                mono_raise_exception (mono_get_exception_divide_by_zero ());
        else if (b == -1 && a == (0x80000000))
-               mono_raise_exception (mono_get_exception_arithmetic ());
+               mono_raise_exception (mono_get_exception_overflow ());
 #endif
        return a / b;
 }
@@ -267,7 +269,7 @@ mono_irem (gint32 a, gint32 b)
        if (!b)
                mono_raise_exception (mono_get_exception_divide_by_zero ());
        else if (b == -1 && a == (0x80000000))
-               mono_raise_exception (mono_get_exception_arithmetic ());
+               mono_raise_exception (mono_get_exception_overflow ());
 #endif
 
        return a % b;
@@ -926,6 +928,16 @@ mono_lconv_to_r8_un (guint64 a)
 }
 #endif
 
+#if defined(__native_client_codegen__) || defined(__native_client__)
+/* When we cross-compile to Native Client we can't directly embed calls */
+/* to the math library on the host. This will use the fmod on the target*/
+double
+mono_fmod(double a, double b)
+{
+       return fmod(a, b);
+}
+#endif
+
 gpointer
 mono_helper_compile_generic_method (MonoObject *obj, MonoMethod *method, gpointer *this_arg)
 {
@@ -1009,18 +1021,91 @@ mono_create_corlib_exception_2 (guint32 token, MonoString *arg1, MonoString *arg
 MonoObject*
 mono_object_castclass (MonoObject *obj, MonoClass *klass)
 {
+       MonoJitTlsData *jit_tls = NULL;
+
+       if (mini_get_debug_options ()->better_cast_details) {
+               jit_tls = TlsGetValue (mono_jit_tls_id);
+               jit_tls->class_cast_from = NULL;
+       }
+
        if (!obj)
                return NULL;
 
        if (mono_object_isinst (obj, klass))
                return obj;
 
+       if (mini_get_debug_options ()->better_cast_details) {
+               jit_tls->class_cast_from = obj->vtable->klass;
+               jit_tls->class_cast_to = klass;
+       }
+
+       mono_raise_exception (mono_exception_from_name (mono_defaults.corlib,
+                                       "System", "InvalidCastException"));
+
+       return NULL;
+}
+
+MonoObject*
+mono_object_castclass_with_cache (MonoObject *obj, MonoClass *klass, gpointer *cache)
+{
+       MonoJitTlsData *jit_tls = NULL;
+       gpointer cached_vtable, obj_vtable;
+
+       if (mini_get_debug_options ()->better_cast_details) {
+               jit_tls = TlsGetValue (mono_jit_tls_id);
+               jit_tls->class_cast_from = NULL;
+       }
+
+       if (!obj)
+               return NULL;
+
+       cached_vtable = *cache;
+       obj_vtable = obj->vtable;
+
+       if (cached_vtable == obj_vtable)
+               return obj;
+
+       if (mono_object_isinst (obj, klass)) {
+               *cache = obj_vtable;
+               return obj;
+       }
+
+       if (mini_get_debug_options ()->better_cast_details) {
+               jit_tls->class_cast_from = obj->vtable->klass;
+               jit_tls->class_cast_to = klass;
+       }
+
        mono_raise_exception (mono_exception_from_name (mono_defaults.corlib,
                                        "System", "InvalidCastException"));
 
        return NULL;
 }
 
+MonoObject*
+mono_object_isinst_with_cache (MonoObject *obj, MonoClass *klass, gpointer *cache)
+{
+       size_t cached_vtable, obj_vtable;
+
+       if (!obj)
+               return NULL;
+
+       cached_vtable = (size_t)*cache;
+       obj_vtable = (size_t)obj->vtable;
+
+       if ((cached_vtable & ~0x1) == obj_vtable) {
+               return (cached_vtable & 0x1) ? NULL : obj;
+       }
+
+       if (mono_object_isinst (obj, klass)) {
+               *cache = (gpointer)obj_vtable;
+               return obj;
+       } else {
+               /*negative cache*/
+               *cache = (gpointer)(obj_vtable | 0x1);
+               return NULL;
+       }
+}
+
 gpointer
 mono_get_native_calli_wrapper (MonoImage *image, MonoMethodSignature *sig, gpointer func)
 {