Mon Mar 25 13:04:56 CET 2002 Paolo Molaro <lupus@ximian.com>
[mono.git] / mono / metadata / icall.c
index 2459a65fb868153f00ba387130e0bb430ad08c89..60c6e6fd169335a47535871b06d34985b9dc6734 100644 (file)
@@ -3,6 +3,7 @@
  *
  * Authors:
  *   Dietmar Maurer (dietmar@ximian.com)
+ *   Paolo Molaro (lupus@ximian.com)
  *
  * (C) 2001 Ximian, Inc.
  */
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/unicode.h>
 #include <mono/metadata/appdomain.h>
+#include <mono/metadata/rand.h>
+#include <mono/metadata/sysmath.h>
+#include <mono/metadata/debug-symfile.h>
 #include <mono/io-layer/io-layer.h>
 #include "decimal.h"
 
+
+static MonoObject *
+ves_icall_System_Array_GetValueImpl (MonoObject *this, guint32 pos)
+{
+       MonoClass *ac;
+       MonoArray *ao;
+       gint32 esize;
+       gpointer *ea;
+
+       ao = (MonoArray *)this;
+       ac = (MonoClass *)ao->obj.vtable->klass;
+
+       esize = mono_array_element_size (ac);
+       ea = (gpointer*)((char*)ao->vector + (pos * esize));
+
+       if (ac->element_class->valuetype)
+               return mono_value_box (this->vtable->domain, ac->element_class, ea);
+       else
+               return *ea;
+}
+
 static MonoObject *
 ves_icall_System_Array_GetValue (MonoObject *this, MonoObject *idxs)
 {
        MonoClass *ac, *ic;
        MonoArray *ao, *io;
-       gint32 i, pos, *ind, esize;
-       gpointer *ea;
+       gint32 i, pos, *ind;
+
+       MONO_CHECK_ARG_NULL (idxs);
 
        io = (MonoArray *)idxs;
        ic = (MonoClass *)io->obj.vtable->klass;
@@ -44,23 +70,286 @@ ves_icall_System_Array_GetValue (MonoObject *this, MonoObject *idxs)
        ac = (MonoClass *)ao->obj.vtable->klass;
 
        g_assert (ic->rank == 1);
-       g_assert (io->bounds [0].length == ac->rank);
+       if (io->bounds [0].length != ac->rank)
+               mono_raise_exception (mono_get_exception_argument (NULL, NULL));
 
        ind = (guint32 *)io->vector;
+       for (i = 0; i < ac->rank; i++)
+               if ((ind [i] < ao->bounds [i].lower_bound) ||
+                   (ind [i] >= ao->bounds [i].length + ao->bounds [i].lower_bound))
+                       mono_raise_exception (mono_get_exception_index_out_of_range ());
 
        pos = ind [0] - ao->bounds [0].lower_bound;
        for (i = 1; i < ac->rank; i++)
                pos = pos*ao->bounds [i].length + ind [i] - 
                        ao->bounds [i].lower_bound;
 
+       return ves_icall_System_Array_GetValueImpl (this, pos);
+}
+
+static void
+ves_icall_System_Array_SetValueImpl (MonoObject *this, MonoObject *value, guint32 pos)
+{
+       MonoArray *ao, *vo;
+       MonoClass *ac, *vc, *ec;
+       gint32 esize, vsize;
+       gpointer *ea, *va;
+
+       guint64 u64;
+       gint64 i64;
+       gdouble r64;
+
+       vo = (MonoArray *)value;
+       if (vo)
+               vc = (MonoClass *)vo->obj.vtable->klass;
+       else
+               vc = NULL;
+
+       ao = (MonoArray *)this;
+       ac = (MonoClass *)ao->obj.vtable->klass;
+       ec = ac->element_class;
+
        esize = mono_array_element_size (ac);
        ea = (gpointer*)((char*)ao->vector + (pos * esize));
+       va = (gpointer*)((char*)vo + sizeof (MonoObject));
 
-       if (ac->element_class->valuetype)
-               return mono_value_box (this->vtable->domain, ac->element_class, ea);
-       else {
-               return *ea;
+       if (!vo) {
+               memset (ea, 0,  esize);
+               return;
+       }
+
+#define NO_WIDENING_CONVERSION G_STMT_START{\
+       mono_raise_exception (mono_get_exception_argument ( \
+               "value", "not a widening conversion")); \
+}G_STMT_END
+
+#define CHECK_WIDENING_CONVERSION(extra) G_STMT_START{\
+       if (esize < vsize + ## extra) \
+               mono_raise_exception (mono_get_exception_argument ( \
+                       "value", "not a widening conversion")); \
+}G_STMT_END
+
+#define INVALID_CAST G_STMT_START{\
+       mono_raise_exception (mono_get_exception_invalid_cast ()); \
+}G_STMT_END
+
+       /* Check element (destination) type. */
+       switch (ec->byval_arg.type) {
+       case MONO_TYPE_STRING:
+               switch (vc->byval_arg.type) {
+               case MONO_TYPE_STRING:
+                       break;
+               default:
+                       INVALID_CAST;
+               }
+               break;
+       case MONO_TYPE_BOOLEAN:
+               switch (vc->byval_arg.type) {
+               case MONO_TYPE_BOOLEAN:
+                       break;
+               case MONO_TYPE_CHAR:
+               case MONO_TYPE_U1:
+               case MONO_TYPE_U2:
+               case MONO_TYPE_U4:
+               case MONO_TYPE_U8:
+               case MONO_TYPE_I1:
+               case MONO_TYPE_I2:
+               case MONO_TYPE_I4:
+               case MONO_TYPE_I8:
+               case MONO_TYPE_R4:
+               case MONO_TYPE_R8:
+                       NO_WIDENING_CONVERSION;
+               default:
+                       INVALID_CAST;
+               }
+               break;
+       }
+
+       if (!ec->valuetype) {
+               *ea = (gpointer)vo;
+               return;
+       }
+
+       if (mono_object_isinst (value, ec)) {
+               memcpy (ea, (char *)vo + sizeof (MonoObject), esize);
+               return;
+       }
+
+       if (!vc->valuetype)
+               INVALID_CAST;
+
+       vsize = mono_class_instance_size (vc) - sizeof (MonoObject);
+
+#if 0
+       g_message (G_STRLOC ": %d (%d) <= %d (%d)",
+                  ec->byval_arg.type, esize,
+                  vc->byval_arg.type, vsize);
+#endif
+
+#define ASSIGN_UNSIGNED(etype) G_STMT_START{\
+       switch (vc->byval_arg.type) { \
+       case MONO_TYPE_U1: \
+       case MONO_TYPE_U2: \
+       case MONO_TYPE_U4: \
+       case MONO_TYPE_U8: \
+       case MONO_TYPE_CHAR: \
+               CHECK_WIDENING_CONVERSION(0); \
+               *(## etype *) ea = (## etype) u64; \
+               return; \
+       /* You can't assign a signed value to an unsigned array. */ \
+       case MONO_TYPE_I1: \
+       case MONO_TYPE_I2: \
+       case MONO_TYPE_I4: \
+       case MONO_TYPE_I8: \
+       /* You can't assign a floating point number to an integer array. */ \
+       case MONO_TYPE_R4: \
+       case MONO_TYPE_R8: \
+               NO_WIDENING_CONVERSION; \
+       } \
+}G_STMT_END
+
+#define ASSIGN_SIGNED(etype) G_STMT_START{\
+       switch (vc->byval_arg.type) { \
+       case MONO_TYPE_I1: \
+       case MONO_TYPE_I2: \
+       case MONO_TYPE_I4: \
+       case MONO_TYPE_I8: \
+               CHECK_WIDENING_CONVERSION(0); \
+               *(## etype *) ea = (## etype) i64; \
+               return; \
+       /* You can assign an unsigned value to a signed array if the array's */ \
+       /* element size is larger than the value size. */ \
+       case MONO_TYPE_U1: \
+       case MONO_TYPE_U2: \
+       case MONO_TYPE_U4: \
+       case MONO_TYPE_U8: \
+       case MONO_TYPE_CHAR: \
+               CHECK_WIDENING_CONVERSION(1); \
+               *(## etype *) ea = (## etype) u64; \
+               return; \
+       /* You can't assign a floating point number to an integer array. */ \
+       case MONO_TYPE_R4: \
+       case MONO_TYPE_R8: \
+               NO_WIDENING_CONVERSION; \
+       } \
+}G_STMT_END
+
+#define ASSIGN_REAL(etype) G_STMT_START{\
+       switch (vc->byval_arg.type) { \
+       case MONO_TYPE_R4: \
+       case MONO_TYPE_R8: \
+               CHECK_WIDENING_CONVERSION(0); \
+               *(## etype *) ea = (## etype) r64; \
+               return; \
+       /* All integer values fit into a floating point array, so we don't */ \
+       /* need to CHECK_WIDENING_CONVERSION here. */ \
+       case MONO_TYPE_I1: \
+       case MONO_TYPE_I2: \
+       case MONO_TYPE_I4: \
+       case MONO_TYPE_I8: \
+               *(## etype *) ea = (## etype) i64; \
+               return; \
+       case MONO_TYPE_U1: \
+       case MONO_TYPE_U2: \
+       case MONO_TYPE_U4: \
+       case MONO_TYPE_U8: \
+       case MONO_TYPE_CHAR: \
+               *(## etype *) ea = (## etype) u64; \
+               return; \
+       } \
+}G_STMT_END
+
+       switch (vc->byval_arg.type) {
+       case MONO_TYPE_U1:
+               u64 = *(guint8 *) va;
+               break;
+       case MONO_TYPE_U2:
+               u64 = *(guint16 *) va;
+               break;
+       case MONO_TYPE_U4:
+               u64 = *(guint32 *) va;
+               break;
+       case MONO_TYPE_U8:
+               u64 = *(guint64 *) va;
+               break;
+       case MONO_TYPE_I1:
+               i64 = *(gint8 *) va;
+               break;
+       case MONO_TYPE_I2:
+               i64 = *(gint16 *) va;
+               break;
+       case MONO_TYPE_I4:
+               i64 = *(gint32 *) va;
+               break;
+       case MONO_TYPE_I8:
+               i64 = *(gint64 *) va;
+               break;
+       case MONO_TYPE_R4:
+               r64 = *(gfloat *) va;
+               break;
+       case MONO_TYPE_R8:
+               r64 = *(gdouble *) va;
+               break;
+       case MONO_TYPE_CHAR:
+               u64 = *(guint16 *) va;
+               break;
+       case MONO_TYPE_BOOLEAN:
+               /* Boolean is only compatible with itself. */
+               switch (ec->byval_arg.type) {
+               case MONO_TYPE_CHAR:
+               case MONO_TYPE_U1:
+               case MONO_TYPE_U2:
+               case MONO_TYPE_U4:
+               case MONO_TYPE_U8:
+               case MONO_TYPE_I1:
+               case MONO_TYPE_I2:
+               case MONO_TYPE_I4:
+               case MONO_TYPE_I8:
+               case MONO_TYPE_R4:
+               case MONO_TYPE_R8:
+                       NO_WIDENING_CONVERSION;
+               default:
+                       INVALID_CAST;
+               }
+               break;
+       }
+
+       /* If we can't do a direct copy, let's try a widening conversion. */
+       switch (ec->byval_arg.type) {
+       case MONO_TYPE_CHAR:
+               ASSIGN_UNSIGNED (guint16);
+       case MONO_TYPE_U1:
+               ASSIGN_UNSIGNED (guint8);
+       case MONO_TYPE_U2:
+               ASSIGN_UNSIGNED (guint16);
+       case MONO_TYPE_U4:
+               ASSIGN_UNSIGNED (guint32);
+       case MONO_TYPE_U8:
+               ASSIGN_UNSIGNED (guint64);
+       case MONO_TYPE_I1:
+               ASSIGN_SIGNED (gint8);
+       case MONO_TYPE_I2:
+               ASSIGN_SIGNED (gint16);
+       case MONO_TYPE_I4:
+               ASSIGN_SIGNED (gint32);
+       case MONO_TYPE_I8:
+               ASSIGN_SIGNED (gint64);
+       case MONO_TYPE_R4:
+               ASSIGN_REAL (gfloat);
+       case MONO_TYPE_R8:
+               ASSIGN_REAL (gdouble);
        }
+
+       INVALID_CAST;
+       /* Not reached, INVALID_CAST does not return. Just to avoid a compiler warning ... */
+       return;
+
+#undef INVALID_CAST
+#undef NO_WIDENING_CONVERSION
+#undef CHECK_WIDENING_CONVERSION
+#undef ASSIGN_UNSIGNED
+#undef ASSIGN_SIGNED
+#undef ASSIGN_REAL
 }
 
 static void 
@@ -68,12 +357,10 @@ ves_icall_System_Array_SetValue (MonoObject *this, MonoObject *value,
                                 MonoObject *idxs)
 {
        MonoArray *ao, *io, *vo;
-       MonoClass *ac, *ic, *vc;
-       gint32 i, pos, *ind, esize;
-       gpointer *ea;
+       MonoClass *ac, *ic;
+       gint32 i, pos, *ind;
 
-       vo = (MonoArray *)value;
-       vc = (MonoClass *)vo->obj.vtable->klass;
+       MONO_CHECK_ARG_NULL (idxs);
 
        io = (MonoArray *)idxs;
        ic = (MonoClass *)io->obj.vtable->klass;
@@ -82,37 +369,56 @@ ves_icall_System_Array_SetValue (MonoObject *this, MonoObject *value,
        ac = (MonoClass *)ao->obj.vtable->klass;
 
        g_assert (ic->rank == 1);
-       g_assert (io->bounds [0].length == ac->rank);
-       if (!mono_object_isinst (value, ac->element_class)) {
-               g_error ("Array not compatible: %s <= %s", ac->element_class->name, vc->name);
-       }
+       if (io->bounds [0].length != ac->rank)
+               mono_raise_exception (mono_get_exception_argument (NULL, NULL));
 
        ind = (guint32 *)io->vector;
+       for (i = 0; i < ac->rank; i++)
+               if ((ind [i] < ao->bounds [i].lower_bound) ||
+                   (ind [i] >= ao->bounds [i].length + ao->bounds [i].lower_bound))
+                       mono_raise_exception (mono_get_exception_index_out_of_range ());
 
        pos = ind [0] - ao->bounds [0].lower_bound;
        for (i = 1; i < ac->rank; i++)
                pos = pos*ao->bounds [i].length + ind [i] - 
                        ao->bounds [i].lower_bound;
 
-       esize = mono_array_element_size (ac);
-       ea = (gpointer*)((char*)ao->vector + (pos * esize));
-
-       if (ac->element_class->valuetype) {
-               g_assert (vc->valuetype);
-
-               memcpy (ea, (char *)vo + sizeof (MonoObject), esize);
-       } else
-               *ea = (gpointer)vo;
-
+       ves_icall_System_Array_SetValueImpl (this, value, pos);
 }
 
-static void
-ves_icall_System_Array_CreateInstanceImpl ()
+static MonoArray *
+ves_icall_System_Array_CreateInstanceImpl (MonoReflectionType *type, MonoArray *lengths, MonoArray *bounds)
 {
-       g_warning ("not implemented");
-       g_assert_not_reached ();
-}
+       MonoClass *aklass;
+       MonoArray *array;
+       gint32 *sizes, i;
+
+       MONO_CHECK_ARG_NULL (type);
+       MONO_CHECK_ARG_NULL (lengths);
+
+       MONO_CHECK_ARG (lengths, mono_array_length (lengths) > 0);
+       if (bounds)
+               MONO_CHECK_ARG (bounds, mono_array_length (lengths) == mono_array_length (bounds));
+
+       for (i = 0; i < mono_array_length (lengths); i++)
+               if (mono_array_get (lengths, gint32, i) < 0)
+                       mono_raise_exception (mono_get_exception_argument_out_of_range (NULL));
+
+       aklass = mono_array_class_get (type->type, mono_array_length (lengths));
+
+       sizes = alloca (aklass->rank * sizeof(guint32) * 2);
+       for (i = 0; i < aklass->rank; ++i) {
+               sizes [i] = mono_array_get (lengths, gint32, i);
+               if (bounds)
+                       sizes [i + aklass->rank] = mono_array_get (bounds, gint32, i);
+               else
+                       sizes [i + aklass->rank] = 0;
+       }
+
+       array = mono_array_new_full (mono_domain_get (), aklass, sizes, sizes + aklass->rank);
 
+       return array;
+}
 
 static gint32 
 ves_icall_System_Array_GetRank (MonoObject *this)
@@ -123,12 +429,18 @@ ves_icall_System_Array_GetRank (MonoObject *this)
 static gint32
 ves_icall_System_Array_GetLength (MonoArray *this, gint32 dimension)
 {
+       gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
+       if ((dimension < 0) || (dimension >= rank))
+               mono_raise_exception (mono_get_exception_index_out_of_range ());
        return this->bounds [dimension].length;
 }
 
 static gint32
 ves_icall_System_Array_GetLowerBound (MonoArray *this, gint32 dimension)
 {
+       gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
+       if ((dimension < 0) || (dimension >= rank))
+               mono_raise_exception (mono_get_exception_index_out_of_range ());
        return this->bounds [dimension].lower_bound;
 }
 
@@ -137,7 +449,7 @@ ves_icall_System_Array_FastCopy (MonoArray *source, int source_idx, MonoArray* d
 {
        int element_size = mono_array_element_size (source->obj.vtable->klass);
        void * dest_addr = mono_array_addr_with_size (dest, element_size, dest_idx);
-       void * source_addr = mono_array_addr_with_size (source, element_size, dest_idx);
+       void * source_addr = mono_array_addr_with_size (source, element_size, source_idx);
 
        memcpy (dest_addr, source_addr, element_size * length);
 }
@@ -193,6 +505,43 @@ ves_icall_System_Object_MemberwiseClone (MonoObject *this)
        return mono_object_clone (this);
 }
 
+static gint32
+ves_icall_System_Object_GetHashCode (MonoObject *this)
+{
+       return *((gint32 *)this - 1);
+}
+
+/*
+ * A hash function for value types. I have no idea if this is a good hash 
+ * function (its similar to g_str_hash).
+ */
+static gint32
+ves_icall_System_ValueType_GetHashCode (MonoObject *this)
+{
+       gint32 i, size;
+       const char *p;
+       guint h;
+
+       MONO_CHECK_ARG_NULL (this);
+
+       size = this->vtable->klass->instance_size - sizeof (MonoObject);
+
+       p = (char *)this + sizeof (MonoObject);
+
+       for (i = 0; i < size; i++) {
+               h = (h << 5) - h + *p;
+               p++;
+       }
+
+       return h;
+}
+
+static MonoReflectionType *
+ves_icall_System_Object_GetType (MonoObject *obj)
+{
+       return mono_type_get_object (mono_domain_get (), &obj->vtable->klass->byval_arg);
+}
+
 static void
 mono_type_type_from_obj (MonoReflectionType *mtype, MonoObject *obj)
 {
@@ -201,22 +550,40 @@ mono_type_type_from_obj (MonoReflectionType *mtype, MonoObject *obj)
 }
 
 static gint32
-ves_icall_get_data_chunk (MonoReflectionAssemblyBuilder *assb, gint32 type, MonoArray *buf)
+ves_icall_AssemblyBuilder_getToken (MonoReflectionAssemblyBuilder *assb, MonoObject *obj)
+{
+       return mono_image_create_token (assb->dynamic_assembly, obj);
+}
+
+static gint32
+ves_icall_get_data_chunk (MonoReflectionAssemblyBuilder *assb, gint32 offset, MonoArray *buf)
 {
        int count;
 
-       if (type == 0) { /* get the header */
+       if (offset == 0) { /* get the header */
                count = mono_image_get_header (assb, (char*)buf->vector, buf->bounds->length);
                if (count != -1)
                        return count;
        } else {
                MonoDynamicAssembly *ass = assb->dynamic_assembly;
                char *p = mono_array_addr (buf, char, 0);
+               int chunklen;
+               offset--;
                count = ass->code.index + ass->meta_size;
-               if (count > buf->bounds->length)
-                       return 0;
-               memcpy (p, ass->code.data, ass->code.index);
-               memcpy (p + ass->code.index, ass->assembly.image->raw_metadata, ass->meta_size);
+               if (count - offset > buf->bounds->length) {
+                       count =  buf->bounds->length;
+               } else
+                       count = count - offset;
+               if (offset < ass->code.index) {
+                       chunklen = ass->code.index - offset;
+                       memcpy (p, ass->code.data + offset, chunklen);
+                       offset += chunklen;
+                       p += chunklen;
+                       chunklen = count - chunklen;
+               } else
+                       chunklen = count;
+               offset -= ass->code.index;
+               memcpy (p, ass->assembly.image->raw_metadata + offset, chunklen);
                return count;
        }
        
@@ -227,7 +594,7 @@ static MonoReflectionType*
 ves_icall_type_from_name (MonoString *name)
 {
        MonoDomain *domain = mono_domain_get (); 
-       MonoClass *klass;
+       MonoType *type;
        MonoImage *image;
        MonoTypeNameParse info;
        gchar *str;
@@ -236,6 +603,7 @@ ves_icall_type_from_name (MonoString *name)
        /*g_print ("requested type %s\n", str);*/
        if (!mono_reflection_parse_type (str, &info)) {
                g_free (str);
+               g_list_free (info.modifiers);
                return NULL;
        }
 
@@ -244,46 +612,28 @@ ves_icall_type_from_name (MonoString *name)
                /* do we need to load if it's not already loaded? */
                if (!image) {
                        g_free (str);
+                       g_list_free (info.modifiers);
                        return NULL;
                }
        } else
                image = mono_defaults.corlib;
-       if (info.nest_name) {
-               klass = mono_class_from_name (image, info.nest_name_space, info.nest_name);
-               if (klass) {
-                       GList *nested;
-                       mono_class_init (klass);
-                       nested = klass->nested_classes;
-                       while (nested) {
-                               klass = nested->data;
-                               if (strcmp (klass->name, info.nest_name) == 0 &&
-                                               strcmp (klass->name_space, info.nest_name_space) == 0)
-                                       break;
-                               klass = NULL;
-                       }
-               }
-       } else {
-               klass = mono_class_from_name (image, info.name_space, info.name);
-       }
+
+       type = mono_reflection_get_type (image, &info, FALSE);
        g_free (str);
-       if (!klass)
+       g_list_free (info.modifiers);
+       if (!type)
                return NULL;
-       mono_class_init (klass);
-       if (info.rank)
-               klass = mono_array_class_get (klass, info.rank);
-       
-       if (info.isbyref || info.ispointer) /* hack */
-               return mono_type_get_object (domain, &klass->this_arg);
-       else
-               return mono_type_get_object (domain, &klass->byval_arg);
+       /*g_print ("got it\n");*/
+       return mono_type_get_object (domain, type);
 }
 
 static MonoReflectionType*
 ves_icall_type_from_handle (MonoType *handle)
 {
        MonoDomain *domain = mono_domain_get (); 
+       MonoClass *klass = mono_class_from_mono_type (handle);
 
-       mono_class_init (handle->data.klass);
+       mono_class_init (klass);
        return mono_type_get_object (domain, handle);
 }
 
@@ -297,7 +647,7 @@ ves_icall_type_Equals (MonoReflectionType *type, MonoReflectionType *c)
 }
 
 static guint32
-ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c)
+ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c, MonoBoolean check_interfaces)
 {
        MonoDomain *domain; 
        MonoClass *klass;
@@ -309,28 +659,29 @@ ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c)
 
        if (!c) /* FIXME: dont know what do do here */
                return 0;
-       
-       while (!type->type) { /* FIXME: hack for TypeBuilder */
-               MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)type;
-               type = tb->parent;
-       }
-
-       while (!c->type) { /* FIXME: hack for TypeBuilder */
-               MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)c;
-               c = tb->parent;
-       }
 
        klass = mono_class_from_mono_type (type->type);
        klassc = mono_class_from_mono_type (c->type);
 
        /* cut&paste from mono_object_isinst (): keep in sync */
-       if (klassc->flags & TYPE_ATTRIBUTE_INTERFACE) {
+       if (check_interfaces && (klassc->flags & TYPE_ATTRIBUTE_INTERFACE) && !(klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
                MonoVTable *klass_vt = mono_class_vtable (domain, klass);
                if ((klassc->interface_id <= klass->max_interface_id) &&
                    klass_vt->interface_offsets [klassc->interface_id])
                        return 1;
+       } else if (check_interfaces && (klassc->flags & TYPE_ATTRIBUTE_INTERFACE) && (klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+               int i;
+
+               for (i = 0; i < klass->interface_count; i ++) {
+                       MonoClass *ic =  klass->interfaces [i];
+                       if (ic == klassc)
+                               return 1;
+               }
        } else {
-               if ((klass->baseval - klassc->baseval) <= klassc->diffval)
+               /*
+                * klass->baseval is 0 for interfaces 
+                */
+               if (klass->baseval && ((klass->baseval - klassc->baseval) <= klassc->diffval))
                        return 1;
        }
        return 0;
@@ -387,6 +738,39 @@ ves_icall_get_field_info (MonoReflectionField *field, MonoFieldInfo *info)
        info->attrs = field->field->type->attrs;
 }
 
+static MonoObject *
+ves_icall_MonoField_GetValue (MonoReflectionField *field, MonoObject *obj) {
+       MonoObject *res;
+       MonoClass *klass;
+       MonoType *ftype = field->field->type;
+       int type = ftype->type;
+       char *p, *r;
+       guint32 align;
+
+       mono_class_init (field->klass);
+       if (ftype->attrs & FIELD_ATTRIBUTE_STATIC) {
+               MonoVTable *vtable;
+               vtable = mono_class_vtable (mono_domain_get (), field->klass);
+               p = (char*)(vtable->data) + field->field->offset;
+       } else {
+               p = (char*)obj + field->field->offset;
+       }
+
+       switch (type) {
+       case MONO_TYPE_OBJECT:
+       case MONO_TYPE_STRING:
+       case MONO_TYPE_SZARRAY:
+       case MONO_TYPE_ARRAY:
+               return *(MonoObject**)p;
+       }
+       klass = mono_class_from_mono_type (ftype);
+       res = mono_object_new (mono_domain_get (), klass);
+       r = (char*)res + sizeof (MonoObject);
+       memcpy (r, p, mono_class_value_size (klass, &align));
+
+       return res;
+}
+
 static void
 ves_icall_get_property_info (MonoReflectionProperty *property, MonoPropertyInfo *info)
 {
@@ -403,27 +787,14 @@ ves_icall_get_property_info (MonoReflectionProperty *property, MonoPropertyInfo
         */
 }
 
-static void
-ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info)
+static MonoArray*
+ves_icall_Type_GetInterfaces (MonoReflectionType* type)
 {
        MonoDomain *domain = mono_domain_get (); 
-       MonoClass *class = mono_class_from_mono_type (type);
-       MonoClass *parent;
        MonoArray *intf;
        int ninterf, i;
-       
-       info->parent = class->parent ? mono_type_get_object (domain, &class->parent->byval_arg): NULL;
-       info->name = mono_string_new (domain, class->name);
-       info->name_space = mono_string_new (domain, class->name_space);
-       info->attrs = class->flags;
-       info->rank = class->rank;
-       info->assembly = NULL; /* FIXME */
-       if (class->enumtype)
-               info->etype = mono_type_get_object (domain, class->enum_basetype);
-       else if (class->element_class)
-               info->etype = mono_type_get_object (domain, &class->element_class->byval_arg);
-       else
-               info->etype = NULL;
+       MonoClass *class = mono_class_from_mono_type (type->type);
+       MonoClass *parent;
 
        ninterf = 0;
        for (parent = class; parent; parent = parent->parent) {
@@ -437,18 +808,78 @@ ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info)
                        ++ninterf;
                }
        }
-       info->interfaces = intf;
+       return intf;
+}
+
+static void
+ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info)
+{
+       MonoDomain *domain = mono_domain_get (); 
+       MonoClass *class = mono_class_from_mono_type (type);
+
+       info->parent = class->parent ? mono_type_get_object (domain, &class->parent->byval_arg): NULL;
+       info->name = mono_string_new (domain, class->name);
+       info->name_space = mono_string_new (domain, class->name_space);
+       info->attrs = class->flags;
+       info->rank = class->rank;
+       info->assembly = NULL; /* FIXME */
+       if (class->enumtype && class->enum_basetype) /* types that are modifierd typebuilkders may not have enum_basetype set */
+               info->etype = mono_type_get_object (domain, class->enum_basetype);
+       else if (class->element_class)
+               info->etype = mono_type_get_object (domain, &class->element_class->byval_arg);
+       else
+               info->etype = NULL;
+
+       info->isbyref = type->byref;
+       info->ispointer = type->type == MONO_TYPE_PTR;
+       info->isprimitive = (type->type >= MONO_TYPE_BOOLEAN) && (type->type <= MONO_TYPE_R8);
 }
 
 static MonoObject*
-ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoArray *params) {
-       //MonoMethodSignature *sig = method->method->signature;
+ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoArray *params) 
+{
+       MonoMethodSignature *sig = method->method->signature;
+       gpointer *pa;
+       int i;
 
-       /*
-        * Do we need to copy the values so that the called method can't change them?
-        */
+       pa = alloca (sizeof (gpointer) * params->bounds->length);
 
-       return NULL;
+       for (i = 0; i < params->bounds->length; i++) {
+               if (sig->params [i]->byref) {
+                       /* fixme: don't know how to handle this */
+                       g_assert_not_reached ();
+               }
+
+               switch (sig->params [i]->type) {
+               case MONO_TYPE_U1:
+               case MONO_TYPE_I1:
+               case MONO_TYPE_BOOLEAN:
+               case MONO_TYPE_U2:
+               case MONO_TYPE_I2:
+               case MONO_TYPE_CHAR:
+               case MONO_TYPE_U:
+               case MONO_TYPE_I:
+               case MONO_TYPE_U4:
+               case MONO_TYPE_I4:
+               case MONO_TYPE_U8:
+               case MONO_TYPE_I8:
+               case MONO_TYPE_VALUETYPE:
+                       pa [i] = (char *)(((gpointer *)params->vector)[i]) + sizeof (MonoObject);
+                       break;
+               case MONO_TYPE_STRING:
+                       pa [i] = (char *)(((gpointer *)params->vector)[i]);
+                       break;
+               default:
+                       g_error ("type 0x%x not handled in invoke", sig->params [i]->type);
+               }
+       }
+
+       if (!strcmp (method->method->name, ".ctor")) {
+               this = mono_object_new (mono_domain_get (), method->method->klass);
+               mono_runtime_invoke (method->method, this, pa);
+               return this;
+       } else
+               return mono_runtime_invoke (method->method, this, pa);
 }
 
 static MonoObject *
@@ -459,13 +890,13 @@ ves_icall_System_Enum_ToObject (MonoReflectionType *type, MonoObject *obj)
        gint32 s1, s2;
        MonoObject *res;
        
-       MONO_CHECK_ARG_NULL (domain, type);
-       MONO_CHECK_ARG_NULL (domain, obj);
+       MONO_CHECK_ARG_NULL (type);
+       MONO_CHECK_ARG_NULL (obj);
 
        enumc = mono_class_from_mono_type (type->type);
 
-       MONO_CHECK_ARG (domain, obj, enumc->enumtype == TRUE);
-       MONO_CHECK_ARG (domain, obj, obj->vtable->klass->byval_arg.type >= MONO_TYPE_I1 &&  
+       MONO_CHECK_ARG (obj, enumc->enumtype == TRUE);
+       MONO_CHECK_ARG (obj, obj->vtable->klass->byval_arg.type >= MONO_TYPE_I1 &&  
                        obj->vtable->klass->byval_arg.type <= MONO_TYPE_U8);
 
        
@@ -562,12 +993,12 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info)
 static MonoMethod*
 search_method (MonoReflectionType *type, char *name, guint32 flags, MonoArray *args)
 {
-       MonoClass *klass;
+       MonoClass *klass, *start_class;
        MonoMethod *m;
        MonoReflectionType *paramt;
        int i, j;
 
-       klass = mono_class_from_mono_type (type->type);
+       start_class = klass = mono_class_from_mono_type (type->type);
        while (klass) {
                for (i = 0; i < klass->method.count; ++i) {
                        m = klass->methods [i];
@@ -587,7 +1018,7 @@ search_method (MonoReflectionType *type, char *name, guint32 flags, MonoArray *a
                }
                klass = klass->parent;
        }
-       g_print ("Method %s::%s (%d) not found\n", klass->name, name, mono_array_length (args));
+       g_print ("Method %s.%s::%s (%d) not found\n", start_class->name_space, start_class->name, name, mono_array_length (args));
        return NULL;
 }
 
@@ -664,103 +1095,296 @@ enum {
        BFLAGS_OptionalParamBinding = 0x40000
 };
 
+static MonoArray*
+ves_icall_Type_GetFields (MonoReflectionType *type, guint32 bflags)
+{
+       MonoDomain *domain; 
+       GSList *l = NULL, *tmp;
+       static MonoClass *System_Reflection_FieldInfo;
+       MonoClass *startklass, *klass;
+       MonoArray *res;
+       MonoObject *member;
+       int i, len, match;
+       MonoClassField *field;
+
+       domain = ((MonoObject *)type)->vtable->domain;
+       klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent: 
+       for (i = 0; i < klass->field.count; ++i) {
+               match = 0;
+               field = &klass->fields [i];
+               if ((field->type->attrs & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) == FIELD_ATTRIBUTE_PUBLIC) {
+                       if (bflags & BFLAGS_Public)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_NonPublic)
+                               match++;
+               }
+               if (!match)
+                       continue;
+               match = 0;
+               if (field->type->attrs & FIELD_ATTRIBUTE_STATIC) {
+                       if (bflags & BFLAGS_Static)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_Instance)
+                               match++;
+               }
+
+               if (!match)
+                       continue;
+               member = (MonoObject*)mono_field_get_object (domain, klass, field);
+               l = g_slist_prepend (l, member);
+       }
+       if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+               goto handle_parent;
+       len = g_slist_length (l);
+       if (!System_Reflection_FieldInfo)
+               System_Reflection_FieldInfo = mono_class_from_name (
+                       mono_defaults.corlib, "System.Reflection", "FieldInfo");
+       res = mono_array_new (domain, System_Reflection_FieldInfo, len);
+       i = 0;
+       tmp = g_slist_reverse (l);
+       for (; tmp; tmp = tmp->next, ++i)
+               mono_array_set (res, gpointer, i, tmp->data);
+       g_slist_free (l);
+       return res;
+}
 
-/*
- * Note: the filter is applied from within corlib.
- */
 static MonoArray*
-ves_icall_type_find_members (MonoReflectionType *type, guint32 membertypes, guint32 bflags)
+ves_icall_Type_GetMethods (MonoReflectionType *type, guint32 bflags)
 {
        MonoDomain *domain; 
        GSList *l = NULL, *tmp;
-       static MonoClass *System_Reflection_MemberInfo;
+       static MonoClass *System_Reflection_MethodInfo;
        MonoClass *startklass, *klass;
        MonoArray *res;
        MonoMethod *method;
        MonoObject *member;
-       int i, is_ctor, len, match;
+       int i, len, match;
 
        domain = ((MonoObject *)type)->vtable->domain;
        klass = startklass = mono_class_from_mono_type (type->type);
 
-       /* FIXME: check the bindingflags */
 handle_parent: 
-       if (membertypes & (1|8)) { /* constructors and methods */
-               for (i = 0; i < klass->method.count; ++i) {
-                       match = 0;
-                       method = klass->methods [i];
-                       if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
-                               if (bflags & BFLAGS_Public)
-                                       match++;
-                       } else {
-                               if (bflags & BFLAGS_NonPublic)
-                                       match++;
-                       }
-                       if (method->flags & METHOD_ATTRIBUTE_STATIC) {
-                               if (bflags & BFLAGS_Static)
-                                       match++;
-                       } else {
-                               if (bflags & BFLAGS_Instance)
-                                       match++;
-                       }
+       for (i = 0; i < klass->method.count; ++i) {
+               match = 0;
+               method = klass->methods [i];
+               if (strcmp (method->name, ".ctor") == 0 || strcmp (method->name, ".cctor") == 0)
+                       continue;
+               if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+                       if (bflags & BFLAGS_Public)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_NonPublic)
+                               match++;
+               }
+               if (!match)
+                       continue;
+               match = 0;
+               if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+                       if (bflags & BFLAGS_Static)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_Instance)
+                               match++;
+               }
 
-                       if (!match)
-                               continue;
-                       member = (MonoObject*)mono_method_get_object (domain, method);
+               if (!match)
+                       continue;
+               match = 0;
+               member = (MonoObject*)mono_method_get_object (domain, method);
                        
-                       is_ctor = strcmp (method->name, ".ctor") == 0 ||
-                                       strcmp (method->name, ".cctor") == 0;
-                       if (is_ctor && (membertypes & 1)) {
-                               l = g_slist_prepend (l, member);
-                               continue;
-                       }
-                       if (!is_ctor && (membertypes & 8)) {
-                               l = g_slist_prepend (l, member);
-                       }
+               l = g_slist_prepend (l, member);
+       }
+       if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+               goto handle_parent;
+       len = g_slist_length (l);
+       if (!System_Reflection_MethodInfo)
+               System_Reflection_MethodInfo = mono_class_from_name (
+                       mono_defaults.corlib, "System.Reflection", "MethodInfo");
+       res = mono_array_new (domain, System_Reflection_MethodInfo, len);
+       i = 0;
+       tmp = l;
+       for (; tmp; tmp = tmp->next, ++i)
+               mono_array_set (res, gpointer, i, tmp->data);
+       g_slist_free (l);
+       return res;
+}
+
+static MonoArray*
+ves_icall_Type_GetConstructors (MonoReflectionType *type, guint32 bflags)
+{
+       MonoDomain *domain; 
+       GSList *l = NULL, *tmp;
+       static MonoClass *System_Reflection_ConstructorInfo;
+       MonoClass *startklass, *klass;
+       MonoArray *res;
+       MonoMethod *method;
+       MonoObject *member;
+       int i, len, match;
+
+       domain = ((MonoObject *)type)->vtable->domain;
+       klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent: 
+       for (i = 0; i < klass->method.count; ++i) {
+               match = 0;
+               method = klass->methods [i];
+               if (strcmp (method->name, ".ctor") && strcmp (method->name, ".cctor"))
+                       continue;
+               if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+                       if (bflags & BFLAGS_Public)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_NonPublic)
+                               match++;
+               }
+               if (!match)
+                       continue;
+               match = 0;
+               if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+                       if (bflags & BFLAGS_Static)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_Instance)
+                               match++;
                }
+
+               if (!match)
+                       continue;
+               member = (MonoObject*)mono_method_get_object (domain, method);
+                       
+               l = g_slist_prepend (l, member);
        }
-       if (membertypes & 4) { /* fields */
-               MonoClassField *field;
-               for (i = 0; i < klass->field.count; ++i) {
-                       match = 0;
-                       field = &klass->fields [i];
-                       if ((field->type->attrs & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) == FIELD_ATTRIBUTE_PUBLIC) {
-                               if (bflags & BFLAGS_Public)
-                                       match++;
-                       } else {
-                               if (bflags & BFLAGS_NonPublic)
-                                       match++;
-                       }
-                       if (field->type->attrs & FIELD_ATTRIBUTE_STATIC) {
-                               if (bflags & BFLAGS_Static)
-                                       match++;
-                       } else {
-                               if (bflags & BFLAGS_Instance)
-                                       match++;
-                       }
+       if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+               goto handle_parent;
+       len = g_slist_length (l);
+       if (!System_Reflection_ConstructorInfo)
+               System_Reflection_ConstructorInfo = mono_class_from_name (
+                       mono_defaults.corlib, "System.Reflection", "ConstructorInfo");
+       res = mono_array_new (domain, System_Reflection_ConstructorInfo, len);
+       i = 0;
+       tmp = l;
+       for (; tmp; tmp = tmp->next, ++i)
+               mono_array_set (res, gpointer, i, tmp->data);
+       g_slist_free (l);
+       return res;
+}
 
-                       if (!match)
-                               continue;
-                       member = (MonoObject*)mono_field_get_object (domain, klass, field);
-                       l = g_slist_prepend (l, member);
+static MonoArray*
+ves_icall_Type_GetProperties (MonoReflectionType *type, guint32 bflags)
+{
+       MonoDomain *domain; 
+       GSList *l = NULL, *tmp;
+       static MonoClass *System_Reflection_PropertyInfo;
+       MonoClass *startklass, *klass;
+       MonoArray *res;
+       MonoMethod *method;
+       MonoProperty *prop;
+       int i, len, match;
+
+       domain = ((MonoObject *)type)->vtable->domain;
+       klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent: 
+       for (i = 0; i < klass->property.count; ++i) {
+               prop = &klass->properties [i];
+               match = 0;
+               method = prop->get;
+               if (!method)
+                       method = prop->set;
+               if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+                       if (bflags & BFLAGS_Public)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_NonPublic)
+                               match++;
+               }
+               if (!match)
+                       continue;
+               match = 0;
+               if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+                       if (bflags & BFLAGS_Static)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_Instance)
+                               match++;
                }
+
+               if (!match)
+                       continue;
+               match = 0;
+               l = g_slist_prepend (l, mono_property_get_object (domain, klass, prop));
        }
-       if (membertypes & 16) { /* properties */
-               MonoProperty *prop;
-               for (i = 0; i < klass->property.count; ++i) {
-                       match = 0;
-                       prop = &klass->properties [i];
-                       /* FIXME: handle bflags */
-                       l = g_slist_prepend (l, mono_property_get_object (domain, klass, prop));
+       if (!l && (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent)))
+               goto handle_parent;
+       len = g_slist_length (l);
+       if (!System_Reflection_PropertyInfo)
+               System_Reflection_PropertyInfo = mono_class_from_name (
+                       mono_defaults.corlib, "System.Reflection", "PropertyInfo");
+       res = mono_array_new (domain, System_Reflection_PropertyInfo, len);
+       i = 0;
+       tmp = l;
+       for (; tmp; tmp = tmp->next, ++i)
+               mono_array_set (res, gpointer, i, tmp->data);
+       g_slist_free (l);
+       return res;
+}
+
+static MonoArray*
+ves_icall_Type_GetEvents (MonoReflectionType *type, guint32 bflags)
+{
+       MonoDomain *domain; 
+       GSList *l = NULL, *tmp;
+       static MonoClass *System_Reflection_EventInfo;
+       MonoClass *startklass, *klass;
+       MonoArray *res;
+       MonoMethod *method;
+       MonoEvent *event;
+       int i, len, match;
+
+       domain = ((MonoObject *)type)->vtable->domain;
+       klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent: 
+       for (i = 0; i < klass->event.count; ++i) {
+               event = &klass->events [i];
+               match = 0;
+               method = event->add;
+               if (!method)
+                       method = event->remove;
+               if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+                       if (bflags & BFLAGS_Public)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_NonPublic)
+                               match++;
+               }
+               if (!match)
+                       continue;
+               match = 0;
+               if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+                       if (bflags & BFLAGS_Static)
+                               match++;
+               } else {
+                       if (bflags & BFLAGS_Instance)
+                               match++;
                }
+
+               if (!match)
+                       continue;
+               match = 0;
+               l = g_slist_prepend (l, mono_event_get_object (domain, klass, event));
        }
        if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
                goto handle_parent;
        len = g_slist_length (l);
-       if (!System_Reflection_MemberInfo)
-               System_Reflection_MemberInfo = mono_class_from_name (
-                       mono_defaults.corlib, "System.Reflection", "MemberInfo");
-       res = mono_array_new (domain, System_Reflection_MemberInfo, len);
+       if (!System_Reflection_EventInfo)
+               System_Reflection_EventInfo = mono_class_from_name (
+                       mono_defaults.corlib, "System.Reflection", "EventInfo");
+       res = mono_array_new (domain, System_Reflection_EventInfo, len);
        i = 0;
        tmp = l;
        for (; tmp; tmp = tmp->next, ++i)
@@ -789,66 +1413,34 @@ static guint32 ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Erro
 }
 
 static MonoReflectionType*
-ves_icall_System_Reflection_Assembly_GetType (MonoReflectionAssembly *assembly, MonoString *type, MonoBoolean throwOnError, MonoBoolean ignoreCase)
+ves_icall_System_Reflection_Assembly_GetType (MonoReflectionAssembly *assembly, MonoString *name, MonoBoolean throwOnError, MonoBoolean ignoreCase)
 {
        MonoDomain *domain = mono_domain_get (); 
-       /* FIXME : use ignoreCase */
-       gchar *name, *namespace, *str;
-       char *byref, *isarray, *ispointer;
-       guint rank;
-       MonoClass *klass;
+       gchar *str;
+       MonoType *type;
+       MonoTypeNameParse info;
 
-       str = namespace = mono_string_to_utf8 (type);
+       str = mono_string_to_utf8 (name);
        /*g_print ("requested type %s in %s\n", str, assembly->assembly->name);*/
-
-       name = strrchr (str, '.');
-       byref = strrchr (str, '&');
-       ispointer = strrchr (str, '*');
-       if (byref)
-               *byref = 0;
-       if (ispointer)
-               *ispointer = 0;
-       isarray = strrchr (str, '[');
-       if (isarray) {
-               rank = 1;
-               *isarray = 0;
-               while (*isarray) {
-                       if (*isarray == ',')
-                               rank++;
-                       if (*isarray == ']')
-                               break;
-                       ++isarray;
-               }
-       }
-
-       if (name) {
-               *name = 0;
-               ++name;
-       } else {
-               namespace = "";
-               name = str;
+       if (!mono_reflection_parse_type (str, &info)) {
+               g_free (str);
+               g_list_free (info.modifiers);
+               if (throwOnError) /* uhm: this is a parse error, though... */
+                       mono_raise_exception (mono_get_exception_type_load ());
+               return NULL;
        }
 
-       klass = mono_class_from_name (assembly->assembly->image, namespace, name);
+       type = mono_reflection_get_type (assembly->assembly->image, &info, ignoreCase);
        g_free (str);
-       if (!klass) {
+       g_list_free (info.modifiers);
+       if (!type) {
                if (throwOnError)
                        mono_raise_exception (mono_get_exception_type_load ());
                return NULL;
        }
-       if (!klass->inited)
-               mono_class_init (klass);
-
-       if (isarray) {
-               klass = mono_array_class_get (klass, rank);
-               mono_class_init (klass);
-               /*g_print ("got array class %s [%d] (0x%x)\n", klass->element_class->name, klass->rank, klass->this_arg.type);*/
-       }
+       /*g_print ("got it\n");*/
+       return mono_type_get_object (domain, type);
 
-       if (byref || ispointer)
-               return mono_type_get_object (domain, &klass->this_arg);
-       else
-               return mono_type_get_object (domain, &klass->byval_arg);
 }
 
 static MonoString *
@@ -876,9 +1468,27 @@ ves_icall_System_MonoType_assQualifiedName (MonoReflectionType *object)
        char *append = NULL;
 
        switch (object->type->type) {
+       case MONO_TYPE_ARRAY: {
+               int i, rank = object->type->data.array->rank;
+               char *tmp, *str = g_strdup ("[");
+               klass = mono_class_from_mono_type (object->type->data.array->type);
+               for (i = 1; i < rank; i++) {
+                       tmp = g_strconcat (str, ",", NULL);
+                       g_free (str);
+                       str = tmp;
+               }
+               tmp = g_strconcat (str, "]", NULL);
+               g_free (str);
+               append = tmp;
+               break;
+       }
        case MONO_TYPE_SZARRAY:
-               klass = object->type->data.type->data.klass;
-               append = "[]";
+               klass = mono_class_from_mono_type (object->type->data.type);
+               append = g_strdup ("[]");
+               break;
+       case MONO_TYPE_PTR:
+               klass = mono_class_from_mono_type (object->type->data.type);
+               append = g_strdup ("*");
                break;
        default:
                klass = object->type->data.klass;
@@ -886,14 +1496,66 @@ ves_icall_System_MonoType_assQualifiedName (MonoReflectionType *object)
        }
 
        fullname = g_strconcat (klass->name_space, ".",
-                                  klass->name, ",",
-                                  klass->image->assembly_name, append, NULL);
+                                  klass->name, append, ",",
+                                  klass->image->assembly_name, NULL);
        res = mono_string_new (domain, fullname);
        g_free (fullname);
+       g_free (append);
 
        return res;
 }
 
+static MonoReflectionType*
+ves_icall_ModuleBuilder_create_modified_type (MonoReflectionTypeBuilder *tb, MonoString *smodifiers)
+{
+       MonoClass *klass;
+       int isbyref = 0, rank;
+       char *str = mono_string_to_utf8 (smodifiers);
+       char *p;
+
+       klass = mono_class_from_mono_type (tb->type.type);
+       p = str;
+       /* logic taken from mono_reflection_parse_type(): keep in sync */
+       while (*p) {
+               switch (*p) {
+               case '&':
+                       if (isbyref) /* only one level allowed by the spec */
+                               return NULL;
+                       isbyref = 1;
+                       p++;
+                       return mono_type_get_object (mono_domain_get (), &klass->this_arg);
+                       break;
+               case '*':
+                       klass = mono_ptr_class_get (&klass->byval_arg);
+                       mono_class_init (klass);
+                       p++;
+                       break;
+               case '[':
+                       rank = 1;
+                       p++;
+                       while (*p) {
+                               if (*p == ']')
+                                       break;
+                               if (*p == ',')
+                                       rank++;
+                               else if (*p != '*') /* '*' means unknown lower bound */
+                                       return NULL;
+                               ++p;
+                       }
+                       if (*p != ']')
+                               return NULL;
+                       p++;
+                       klass = mono_array_class_get (&klass->byval_arg, rank);
+                       mono_class_init (klass);
+                       break;
+               default:
+                       break;
+               }
+       }
+       g_free (str);
+       return mono_type_get_object (mono_domain_get (), &klass->byval_arg);
+}
+
 static MonoString *
 ves_icall_System_PAL_GetCurrentDirectory (MonoObject *object)
 {
@@ -914,6 +1576,8 @@ ves_icall_System_PAL_GetCurrentDirectory (MonoObject *object)
 static gint64
 ves_icall_System_DateTime_GetNow ()
 {
+#ifndef PLATFORM_WIN32
+       /* FIXME: put this in io-layer and call it GetLocalTime */
        struct timeval tv;
        gint64 res;
 
@@ -923,15 +1587,155 @@ ves_icall_System_DateTime_GetNow ()
        }
 
        /* fixme: raise exception */
+#endif
        return 0;
 }
 
+/*
+ * This is heavily based on zdump.c from glibc 2.2.
+ *
+ *  * data[0]:  start of daylight saving time (in DateTime ticks).
+ *  * data[1]:  end of daylight saving time (in DateTime ticks).
+ *  * data[2]:  utcoffset (in TimeSpan ticks).
+ *  * data[3]:  additional offset when daylight saving (in TimeSpan ticks).
+ *  * name[0]:  name of this timezone when not daylight saving.
+ *  * name[1]:  name of this timezone when daylight saving.
+ *
+ *  FIXME: This only works with "standard" Unix dates (years between 1900 and 2100) while
+ *         the class library allows years between 1 and 9999.
+ *
+ *  Returns true on success and zero on failure.
+ */
+static guint32
+ves_icall_System_CurrentTimeZone_GetTimeZoneData (guint32 year, MonoArray **data, MonoArray **names)
+{
+#ifndef PLATFORM_WIN32
+       MonoDomain *domain = mono_domain_get ();
+       struct tm start, tt;
+       time_t t;
+
+       long int gmtoff;
+       int is_daylight = 0, day;
+
+       memset (&start, 0, sizeof (start));
+
+       start.tm_mday = 1;
+       start.tm_year = year-1900;
+
+       t = mktime (&start);
+       gmtoff = start.tm_gmtoff;
+
+       MONO_CHECK_ARG_NULL (data);
+       MONO_CHECK_ARG_NULL (names);
+
+       (*data) = mono_array_new (domain, mono_defaults.int64_class, 4);
+       (*names) = mono_array_new (domain, mono_defaults.string_class, 2);
+
+       /* For each day of the year, calculate the tm_gmtoff. */
+       for (day = 0; day < 365; day++) {
+
+               t += 3600*24;
+               tt = *localtime (&t);
+
+               /* Daylight saving starts or ends here. */
+               if (tt.tm_gmtoff != gmtoff) {
+                       struct tm tt1;
+                       time_t t1;
+
+                       /* Try to find the exact hour when daylight saving starts/ends. */
+                       t1 = t;
+                       do {
+                               t1 -= 3600;
+                               tt1 = *localtime (&t1);
+                       } while (tt1.tm_gmtoff != gmtoff);
+
+                       /* Try to find the exact minute when daylight saving starts/ends. */
+                       do {
+                               t1 += 60;
+                               tt1 = *localtime (&t1);
+                       } while (tt1.tm_gmtoff == gmtoff);
+
+                       /* Write data, if we're already in daylight saving, we're done. */
+                       if (is_daylight) {
+                               mono_array_set ((*names), gpointer, 0, mono_string_new (domain, tt.tm_zone));
+                               mono_array_set ((*data), gint64, 1, ((gint64)t1 + EPOCH_ADJUST) * 10000000L);
+                               return 1;
+                       } else {
+                               mono_array_set ((*names), gpointer, 1, mono_string_new (domain, tt.tm_zone));
+                               mono_array_set ((*data), gint64, 0, ((gint64)t1 + EPOCH_ADJUST) * 10000000L);
+                               is_daylight = 1;
+                       }
+
+                       /* This is only set once when we enter daylight saving. */
+                       mono_array_set ((*data), gint64, 2, (gint64)gmtoff * 10000000L);
+                       mono_array_set ((*data), gint64, 3, (gint64)(tt.tm_gmtoff - gmtoff) * 10000000L);
+
+                       gmtoff = tt.tm_gmtoff;
+               }
+
+               gmtoff = tt.tm_gmtoff;
+       }
+#endif
+       return 0;
+}
+
+static gpointer
+ves_icall_System_Object_obj_address (MonoObject *this) {
+       return this;
+}
+
+/* System.Buffer */
+
+static gint32 
+ves_icall_System_Buffer_ByteLengthInternal (MonoArray *array) {
+       MonoClass *klass;
+       MonoTypeEnum etype;
+       int length, esize;
+       int i;
+
+       klass = array->obj.vtable->klass;
+       etype = klass->element_class->byval_arg.type;
+       if (etype < MONO_TYPE_BOOLEAN || etype > MONO_TYPE_R8)
+               return -1;
+
+       length = 0;
+       for (i = 0; i < klass->rank; ++ i)
+               length += array->bounds [i].length;
+
+       esize = mono_array_element_size (klass);
+       return length * esize;
+}
+
+static gint8 
+ves_icall_System_Buffer_GetByteInternal (MonoArray *array, gint32 index) {
+       return mono_array_get (array, gint8, index);
+}
+
+static void 
+ves_icall_System_Buffer_SetByteInternal (MonoArray *array, gint32 index, gint8 value) {
+       mono_array_set (array, gint8, index, value);
+}
+
+static void 
+ves_icall_System_Buffer_BlockCopyInternal (MonoArray *src, gint32 src_offset, MonoArray *dest, gint32 dest_offset, gint32 count) {
+       char *src_buf, *dest_buf;
+
+       src_buf = (gint8 *)src->vector + src_offset;
+       dest_buf = (gint8 *)dest->vector + dest_offset;
+
+       memcpy (dest_buf, src_buf, count);
+}
+
+/* icall map */
+
 static gpointer icall_map [] = {
        /*
         * System.Array
         */
        "System.Array::GetValue",         ves_icall_System_Array_GetValue,
        "System.Array::SetValue",         ves_icall_System_Array_SetValue,
+       "System.Array::GetValueImpl",     ves_icall_System_Array_GetValueImpl,
+       "System.Array::SetValueImpl",     ves_icall_System_Array_SetValueImpl,
        "System.Array::GetRank",          ves_icall_System_Array_GetRank,
        "System.Array::GetLength",        ves_icall_System_Array_GetLength,
        "System.Array::GetLowerBound",    ves_icall_System_Array_GetLowerBound,
@@ -943,12 +1747,20 @@ static gpointer icall_map [] = {
         * System.Object
         */
        "System.Object::MemberwiseClone", ves_icall_System_Object_MemberwiseClone,
+       "System.Object::GetType", ves_icall_System_Object_GetType,
+       "System.Object::GetHashCode", ves_icall_System_Object_GetHashCode,
+       "System.Object::obj_address", ves_icall_System_Object_obj_address,
+
+       /*
+        * System.ValueType
+        */
+       "System.ValueType::GetHashCode", ves_icall_System_ValueType_GetHashCode,
 
        /*
         * System.String
         */
-       "System.String::IsInterned", mono_string_is_interned,
-       "System.String::Intern", mono_string_intern,
+       "System.String::_IsInterned", mono_string_is_interned,
+       "System.String::_Intern", mono_string_intern,
 
        /*
         * System.AppDomain
@@ -990,13 +1802,15 @@ static gpointer icall_map [] = {
        /*
         * ModuleBuilder
         */
+       "System.Reflection.Emit.ModuleBuilder::create_modified_type", ves_icall_ModuleBuilder_create_modified_type,
        
        /*
         * AssemblyBuilder
         */
        "System.Reflection.Emit.AssemblyBuilder::getDataChunk", ves_icall_get_data_chunk,
        "System.Reflection.Emit.AssemblyBuilder::getUSIndex", mono_image_insert_string,
-       "System.Reflection.Emit.AssemblyBuilder::getToken", mono_image_create_token,
+       "System.Reflection.Emit.AssemblyBuilder::getToken", ves_icall_AssemblyBuilder_getToken,
+       "System.Reflection.Emit.AssemblyBuilder::basic_init", mono_image_basic_init,
 
        /*
         * Reflection stuff.
@@ -1006,6 +1820,13 @@ static gpointer icall_map [] = {
        "System.Reflection.MonoFieldInfo::get_field_info", ves_icall_get_field_info,
        "System.Reflection.MonoPropertyInfo::get_property_info", ves_icall_get_property_info,
        "System.Reflection.MonoMethod::InternalInvoke", ves_icall_InternalInvoke,
+       "System.Reflection.MonoCMethod::InternalInvoke", ves_icall_InternalInvoke,
+       "System.MonoCustomAttrs::GetCustomAttributes", mono_reflection_get_custom_attrs,
+       "System.Reflection.Emit.CustomAttributeBuilder::GetBlob", mono_reflection_get_custom_attrs_blob,
+       "System.Reflection.MonoField::GetValue", ves_icall_MonoField_GetValue,
+       "System.Reflection.Emit.SignatureHelper::get_signature_local", mono_reflection_sighelper_get_signature_local,
+       "System.Reflection.Emit.SignatureHelper::get_signature_field", mono_reflection_sighelper_get_signature_field,
+
        
        /* System.Enum */
 
@@ -1016,6 +1837,8 @@ static gpointer icall_map [] = {
        /*
         * TypeBuilder
         */
+       "System.Reflection.Emit.TypeBuilder::setup_internal_class", mono_reflection_setup_internal_class,
+
        
        /*
         * MethodBuilder
@@ -1032,7 +1855,6 @@ static gpointer icall_map [] = {
        "System.MonoType::get_attributes", ves_icall_get_attributes,
        "System.Type::type_is_subtype_of", ves_icall_type_is_subtype_of,
        "System.Type::Equals", ves_icall_type_Equals,
-       "System.Type::FindMembers", ves_icall_type_find_members,
 
        /*
         * System.Runtime.CompilerServices.RuntimeHelpers
@@ -1082,6 +1904,12 @@ static gpointer icall_map [] = {
        "System.MonoType::assQualifiedName", ves_icall_System_MonoType_assQualifiedName,
        "System.MonoType::type_from_obj", mono_type_type_from_obj,
        "System.MonoType::get_type_info", ves_icall_get_type_info,
+       "System.MonoType::GetFields", ves_icall_Type_GetFields,
+       "System.MonoType::GetMethods", ves_icall_Type_GetMethods,
+       "System.MonoType::GetConstructors", ves_icall_Type_GetConstructors,
+       "System.MonoType::GetProperties", ves_icall_Type_GetProperties,
+       "System.MonoType::GetEvents", ves_icall_Type_GetEvents,
+       "System.MonoType::GetInterfaces", ves_icall_Type_GetInterfaces,
 
        "System.PAL.OpSys::GetCurrentDirectory", ves_icall_System_PAL_GetCurrentDirectory,
 
@@ -1089,12 +1917,6 @@ static gpointer icall_map [] = {
         * System.PAL.OpSys I/O Services
         */
        "System.PAL.OpSys::GetStdHandle", ves_icall_System_PAL_OpSys_GetStdHandle,
-       "System.PAL.OpSys::ReadFile", ves_icall_System_PAL_OpSys_ReadFile,
-       "System.PAL.OpSys::WriteFile", ves_icall_System_PAL_OpSys_WriteFile,
-       "System.PAL.OpSys::SetLengthFile", ves_icall_System_PAL_OpSys_SetLengthFile,
-       "System.PAL.OpSys::OpenFile", ves_icall_System_PAL_OpSys_OpenFile,
-       "System.PAL.OpSys::CloseFile", ves_icall_System_PAL_OpSys_CloseFile,
-       "System.PAL.OpSys::SeekFile", ves_icall_System_PAL_OpSys_SeekFile,
        "System.PAL.OpSys::DeleteFile", ves_icall_System_PAL_OpSys_DeleteFile,
        "System.PAL.OpSys::ExistsFile", ves_icall_System_PAL_OpSys_ExistsFile,
        "System.PAL.OpSys::GetFileTime", ves_icall_System_PAL_OpSys_GetFileTime,
@@ -1154,6 +1976,63 @@ static gpointer icall_map [] = {
        "System.Text.Encoding::IConvGetChars", ves_icall_iconv_get_chars,
 
        "System.DateTime::GetNow", ves_icall_System_DateTime_GetNow,
+       "System.CurrentTimeZone::GetTimeZoneData", ves_icall_System_CurrentTimeZone_GetTimeZoneData,
+
+       /*
+        * System.Security.Cryptography calls
+        */
+
+        "System.Security.Cryptography.RNGCryptoServiceProvider::GetBytes", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes,
+        "System.Security.Cryptography.RNG_CryptoServiceProvider::GetNonZeroBytes", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes,
+       
+       /*
+        * System.Buffer
+        */
+       "System.Buffer::ByteLengthInternal", ves_icall_System_Buffer_ByteLengthInternal,
+       "System.Buffer::GetByteInternal", ves_icall_System_Buffer_GetByteInternal,
+       "System.Buffer::SetByteInternal", ves_icall_System_Buffer_SetByteInternal,
+       "System.Buffer::BlockCopyInternal", ves_icall_System_Buffer_BlockCopyInternal,
+
+       /*
+        * System.IO.FileStream
+        */
+       "System.IO.FileStream::FileOpen", ves_icall_System_IO_FileStream_FileOpen,
+       "System.IO.FileStream::FileClose", ves_icall_System_IO_FileStream_FileClose,
+       "System.IO.FileStream::FileRead", ves_icall_System_IO_FileStream_FileRead,
+       "System.IO.FileStream::FileWrite", ves_icall_System_IO_FileStream_FileWrite,
+       "System.IO.FileStream::FileSeek", ves_icall_System_IO_FileStream_FileSeek,
+       "System.IO.FileStream::FileGetLength", ves_icall_System_IO_FileStream_FileGetLength,
+       "System.IO.FileStream::FileSetLength", ves_icall_System_IO_FileStream_FileSetLength,
+       "System.IO.FileStream::FileFlush", ves_icall_System_IO_FileStream_FileFlush,
+
+       /*
+        * System.Math
+        */
+       "System.Math::Sin", ves_icall_System_Math_Sin,
+        "System.Math::Cos", ves_icall_System_Math_Cos,
+        "System.Math::Tan", ves_icall_System_Math_Tan,
+        "System.Math::Sinh", ves_icall_System_Math_Sinh,
+        "System.Math::Cosh", ves_icall_System_Math_Cosh,
+        "System.Math::Tanh", ves_icall_System_Math_Tanh,
+        "System.Math::Acos", ves_icall_System_Math_Acos,
+        "System.Math::Asin", ves_icall_System_Math_Asin,
+        "System.Math::Atan", ves_icall_System_Math_Atan,
+        "System.Math::Atan2", ves_icall_System_Math_Atan2,
+        "System.Math::Exp", ves_icall_System_Math_Exp,
+        "System.Math::Log", ves_icall_System_Math_Log,
+        "System.Math::Log10", ves_icall_System_Math_Log10,
+        "System.Math::Pow", ves_icall_System_Math_Pow,
+        "System.Math::Sqrt", ves_icall_System_Math_Sqrt,
+
+       /*
+        * Mono.CSharp.Debugger
+        */
+       "Mono.CSharp.Debugger.MonoSymbolWriter::get_local_type_from_sig", ves_icall_Debugger_MonoSymbolWriter_get_local_type_from_sig,
+       "Mono.CSharp.Debugger.MonoSymbolWriter::get_method", ves_icall_Debugger_MonoSymbolWriter_method_from_token,
+       "Mono.CSharp.Debugger.DwarfFileWriter::get_type_token", ves_icall_Debugger_DwarfFileWriter_get_type_token,
+
+
+
        /*
         * add other internal calls here
         */