2007-07-09 Mark Probst <mark.probst@gmail.com>

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

diff --git a/mono/mini/jit-icalls.c b/mono/mini/jit-icalls.c
index 921e9f33de0d24ecd12935efee43263bab8a4f0b..d4dc21b1563773e964a00e3c64070951c91f6cd2 100644 (file)
--- a/mono/mini/jit-icalls.c
+++ b/mono/mini/jit-icalls.c
@@ -457,6 +457,12 @@ mono_conv_to_r8 (int a)
        return (double)a;
 }
 
+double
+mono_conv_to_r4 (int a)
+{
+       return (double)(float)a;
+}
+
 gint8
 mono_fconv_i1 (double a)
 {
@@ -589,53 +595,16 @@ mono_fstore_r4 (double val, float *ptr)
        *ptr = (float)val;
 }
 
-#endif
-
-/**
- * ves_array_element_address:
- * @this: a pointer to the array object
- *
- * Returns: the address of an array element.
- */
-gpointer 
-ves_array_element_address (MonoArray *this, ...)
+/* returns the integer bitpattern that is passed in the regs or stack */
+guint32
+mono_fload_r4_arg (double val)
 {
-       MonoClass *class;
-       va_list ap;
-       int i, ind, esize, realidx;
-       gpointer ea;
-
-       MONO_ARCH_SAVE_REGS;
-
-       g_assert (this != NULL);
-
-       va_start(ap, this);
-
-       class = this->obj.vtable->klass;
-
-       g_assert (this->bounds != NULL);
-
-       esize = mono_array_element_size (class);
-       ind = va_arg(ap, int);
-       ind -= (int)this->bounds [0].lower_bound;
-       if ((guint32)ind >= (guint32)this->bounds [0].length)
-               mono_raise_exception (mono_get_exception_index_out_of_range ());
-       for (i = 1; i < class->rank; i++) {
-               realidx = va_arg(ap, int) - (int)this->bounds [i].lower_bound;
-               if ((guint32)realidx >= (guint32)this->bounds [i].length)
-                       mono_raise_exception (mono_get_exception_index_out_of_range ());
-               ind *= this->bounds [i].length;
-               ind += realidx;
-       }
-       esize *= ind;
-
-       ea = (gpointer*)(gpointer)((char*)this->vector + esize);
-
-       va_end(ap);
-
-       return ea;
+       float v = (float)val;
+       return *(guint32*)&v;
 }
 
+#endif
+
 MonoArray *
 mono_array_new_va (MonoMethod *cm, ...)
 {
@@ -817,6 +786,8 @@ mono_helper_compile_generic_method (MonoObject *obj, MonoMethod *method, MonoGen
        MonoMethod *vmethod, *inflated;
        gpointer addr;
 
+       mono_jit_stats.generic_virtual_invocations++;
+
        if (obj == NULL)
                mono_raise_exception (mono_get_exception_null_reference ());
        vmethod = mono_object_get_virtual_method (obj, method);
@@ -828,8 +799,8 @@ mono_helper_compile_generic_method (MonoObject *obj, MonoMethod *method, MonoGen
           the same context.
        */
        g_assert (!vmethod->klass->generic_container);
-       g_assert (!vmethod->klass->generic_class || !vmethod->klass->generic_class->inst->is_open);
-       g_assert (!context->gmethod || !context->gmethod->inst->is_open);
+       g_assert (!vmethod->klass->generic_class || !vmethod->klass->generic_class->context.class_inst->is_open);
+       g_assert (!context->method_inst || !context->method_inst->is_open);
        inflated = mono_class_inflate_generic_method (vmethod, context);
        inflated = mono_get_inflated_method (inflated);
        addr = mono_compile_method (inflated);