X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmetadata%2Ficall.c;h=cd140f804176b67c6eedcfe0519218d6f6c7a103;hb=df4e9ca2847f36a4a54acba912c6a6baa99f03aa;hp=8d3c5779edc0739bf4d0dee194df15b759852a43;hpb=0d39b89052792971c095ae30404c195df41c5d30;p=mono.git diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index 8d3c5779edc..cd140f80417 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -4,6 +4,7 @@ * Authors: * Dietmar Maurer (dietmar@ximian.com) * Paolo Molaro (lupus@ximian.com) + * Patrik Torstensson (patrik.torstensson@labs2.com) * * (C) 2001 Ximian, Inc. */ @@ -14,6 +15,9 @@ #include #include #include +#if defined (PLATFORM_WIN32) +#include +#endif #include #include @@ -27,58 +31,55 @@ #include #include #include +#include #include +#include +#include +#include #include + +#if defined (PLATFORM_WIN32) +#include +#endif #include "decimal.h" +static MonoString * +mono_double_ToStringImpl (double value) +{ + /* FIXME: Handle formats, etc. */ + const gchar *retVal; + retVal = g_strdup_printf ("%f", value); + return mono_string_new (mono_domain_get (), retVal); +} + static MonoObject * -ves_icall_System_Array_GetValue (MonoObject *this, MonoObject *idxs) +ves_icall_System_Array_GetValueImpl (MonoObject *this, guint32 pos) { - MonoClass *ac, *ic; - MonoArray *ao, *io; - gint32 i, pos, *ind, esize; + MonoClass *ac; + MonoArray *ao; + gint32 esize; gpointer *ea; - io = (MonoArray *)idxs; - ic = (MonoClass *)io->obj.vtable->klass; - ao = (MonoArray *)this; ac = (MonoClass *)ao->obj.vtable->klass; - g_assert (ic->rank == 1); - g_assert (io->bounds [0].length == ac->rank); - - ind = (guint32 *)io->vector; - - 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) return mono_value_box (this->vtable->domain, ac->element_class, ea); - else { + else return *ea; - } } -static void -ves_icall_System_Array_SetValue (MonoObject *this, MonoObject *value, - MonoObject *idxs) +static MonoObject * +ves_icall_System_Array_GetValue (MonoObject *this, MonoObject *idxs) { - MonoArray *ao, *io, *vo; - MonoClass *ac, *ic, *vc; - gint32 i, pos, *ind, esize; - gpointer *ea; + MonoClass *ac, *ic; + MonoArray *ao, *io; + gint32 i, pos, *ind; - vo = (MonoArray *)value; - if (vo) - vc = (MonoClass *)vo->obj.vtable->klass; - else - vc = NULL; + MONO_CHECK_ARG_NULL (idxs); io = (MonoArray *)idxs; ic = (MonoClass *)io->obj.vtable->klass; @@ -87,39 +88,365 @@ 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 (vo && !mono_object_isinst (value, ac->element_class)) { - g_error ("Array not compatible: %s <= %s", ac->element_class->name, vc->name); - } + if (io->bounds != NULL || io->max_length != ac->rank) + mono_raise_exception (mono_get_exception_argument (NULL, NULL)); ind = (guint32 *)io->vector; + if (ao->bounds == NULL) { + if (*ind < 0 || *ind >= ao->max_length) + mono_raise_exception (mono_get_exception_index_out_of_range ()); + + return ves_icall_System_Array_GetValueImpl (this, *ind); + } + + 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 (MonoArray *this, MonoObject *value, guint32 pos) +{ + MonoClass *ac, *vc, *ec; + gint32 esize, vsize; + gpointer *ea, *va; + + guint64 u64; + gint64 i64; + gdouble r64; + + if (value) + vc = value->vtable->klass; + else + vc = NULL; + + ac = this->obj.vtable->klass; + ec = ac->element_class; + esize = mono_array_element_size (ac); - ea = (gpointer*)((char*)ao->vector + (pos * esize)); + ea = (gpointer*)((char*)this->vector + (pos * esize)); + va = (gpointer*)((char*)value + sizeof (MonoObject)); - if (ac->element_class->valuetype) { - if (vo) { - g_assert (vc->valuetype); - memcpy (ea, (char *)vo + sizeof (MonoObject), esize); - } else - memset (ea, '0', esize); - } else - *ea = (gpointer)vo; + if (!value) { + 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)value; + return; + } + + if (mono_object_isinst (value, ec)) { + memcpy (ea, (char *)value + 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 -ves_icall_System_Array_CreateInstanceImpl () +static void +ves_icall_System_Array_SetValue (MonoArray *this, MonoObject *value, + MonoArray *idxs) { - g_warning ("not implemented"); - g_assert_not_reached (); + MonoClass *ac, *ic; + gint32 i, pos, *ind; + + MONO_CHECK_ARG_NULL (idxs); + + ic = idxs->obj.vtable->klass; + ac = this->obj.vtable->klass; + + g_assert (ic->rank == 1); + if (idxs->bounds != NULL || idxs->max_length != ac->rank) + mono_raise_exception (mono_get_exception_argument (NULL, NULL)); + + ind = (guint32 *)idxs->vector; + + if (this->bounds == NULL) { + if (*ind < 0 || *ind >= this->max_length) + mono_raise_exception (mono_get_exception_index_out_of_range ()); + + ves_icall_System_Array_SetValueImpl (this, value, *ind); + return; + } + + for (i = 0; i < ac->rank; i++) + if ((ind [i] < this->bounds [i].lower_bound) || + (ind [i] >= this->bounds [i].length + this->bounds [i].lower_bound)) + mono_raise_exception (mono_get_exception_index_out_of_range ()); + + pos = ind [0] - this->bounds [0].lower_bound; + for (i = 1; i < ac->rank; i++) + pos = pos * this->bounds [i].length + ind [i] - + this->bounds [i].lower_bound; + + ves_icall_System_Array_SetValueImpl (this, value, pos); } +static MonoArray * +ves_icall_System_Array_CreateInstanceImpl (MonoReflectionType *type, MonoArray *lengths, MonoArray *bounds) +{ + 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) @@ -130,12 +457,26 @@ 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 ()); + + if (this->bounds == NULL) + return this->max_length; + 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 ()); + + if (this->bounds == NULL) + return 0; + return this->bounds [dimension].lower_bound; } @@ -144,9 +485,11 @@ 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); + g_assert (dest_idx + length <= mono_array_length (dest)); + g_assert (source_idx + length <= mono_array_length (source)); + memmove (dest_addr, source_addr, element_size * length); } static void @@ -156,8 +499,11 @@ ves_icall_InitializeArray (MonoArray *array, MonoClassField *field_handle) guint32 size = mono_array_element_size (klass); int i; - for (i = 0; i < klass->rank; ++i) - size *= array->bounds [i].length; + if (array->bounds == NULL) + size *= array->max_length; + else + for (i = 0; i < klass->rank; ++i) + size *= array->bounds [i].length; memcpy (mono_array_addr (array, char, 0), field_handle->data, size); @@ -200,6 +546,56 @@ 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 = (const char *)this + sizeof (MonoObject); + + for (i = 0; i < size; i++) { + h = (h << 5) - h + *p; + p++; + } + + return h; +} + +static MonoBoolean +ves_icall_System_ValueType_Equals (MonoObject *this, MonoObject *that) +{ + gint32 size; + const char *p, *s; + + MONO_CHECK_ARG_NULL (that); + + if (this->vtable != that->vtable) + return FALSE; + + size = this->vtable->klass->instance_size - sizeof (MonoObject); + + p = (const char *)this + sizeof (MonoObject); + s = (const char *)that + sizeof (MonoObject); + + return memcmp (p, s, size)? FALSE: TRUE; +} + static MonoReflectionType * ves_icall_System_Object_GetType (MonoObject *obj) { @@ -216,40 +612,55 @@ mono_type_type_from_obj (MonoReflectionType *mtype, MonoObject *obj) static gint32 ves_icall_AssemblyBuilder_getToken (MonoReflectionAssemblyBuilder *assb, MonoObject *obj) { - mono_image_basic_init (assb); return mono_image_create_token (assb->dynamic_assembly, obj); } static gint32 -ves_icall_get_data_chunk (MonoReflectionAssemblyBuilder *assb, gint32 type, MonoArray *buf) +ves_icall_AssemblyBuilder_getPEHeader (MonoReflectionAssemblyBuilder *assb, MonoArray *buf, gint32 *data_size) { - int count; + int count, hsize; + MonoDynamicAssembly *ass = assb->dynamic_assembly; + + hsize = mono_image_get_header (assb, (char*)buf->vector, mono_array_length (buf)); + if (hsize < 0) + return hsize; + count = ass->code.index + ass->meta_size; + count += 512 - 1; + count &= ~(512 - 1); + *data_size = count; + + return hsize; +} - if (type == 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); - count = ass->code.index + ass->meta_size; - if (count > buf->bounds->length) { - g_print ("assembly data exceed supplied buffer\n"); - return 0; - } - memcpy (p, ass->code.data, ass->code.index); - memcpy (p + ass->code.index, ass->assembly.image->raw_metadata, ass->meta_size); - return count; - } +static gint32 +ves_icall_AssemblyBuilder_getDataChunk (MonoReflectionAssemblyBuilder *assb, MonoArray *buf) +{ + int count, real_data; + MonoDynamicAssembly *ass = assb->dynamic_assembly; + char *p = mono_array_addr (buf, char, 0); - return 0; + count = real_data = ass->code.index + ass->meta_size; + count += 512 - 1; + count &= ~(512 - 1); + if (count > mono_array_length (buf)) + return -1; + count -= real_data; + + memcpy (p, ass->code.data, ass->code.index); + p += ass->code.index; + memcpy (p, ass->assembly.image->raw_metadata, ass->meta_size); + p += ass->meta_size; + /* null-pad section */ + memset (p, 0, count); + + return real_data + count; } static MonoReflectionType* ves_icall_type_from_name (MonoString *name) { MonoDomain *domain = mono_domain_get (); - MonoClass *klass; + MonoType *type; MonoImage *image; MonoTypeNameParse info; gchar *str; @@ -258,6 +669,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; } @@ -266,46 +678,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); } @@ -331,16 +725,6 @@ ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c, M 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); @@ -384,7 +768,6 @@ ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info) info->parent = mono_type_get_object (domain, &method->klass->byval_arg); info->ret = mono_type_get_object (domain, method->signature->ret); - info->name = mono_string_new (domain, method->name); info->attrs = method->flags; info->implattrs = method->iflags; } @@ -469,27 +852,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) { @@ -503,48 +873,178 @@ ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info) ++ninterf; } } - info->interfaces = intf; + return intf; +} + +static MonoReflectionType* +ves_icall_MonoType_GetElementType (MonoReflectionType *type) +{ + MonoClass *class = mono_class_from_mono_type (type->type); + if (class->enumtype && class->enum_basetype) /* types that are modifierd typebuilkders may not have enum_basetype set */ + return mono_type_get_object (mono_object_domain (type), class->enum_basetype); + else if (class->element_class) + return mono_type_get_object (mono_object_domain (type), &class->element_class->byval_arg); + else + return NULL; } -static MonoObject* -ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoArray *params) { - //MonoMethodSignature *sig = method->method->signature; +static void +ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info) +{ + MonoDomain *domain = mono_domain_get (); + MonoClass *class = mono_class_from_mono_type (type); - /* - * Do we need to copy the values so that the called method can't change them? - */ + 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 = mono_assembly_get_object (domain, class->image->assembly); + 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; - return 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_System_Enum_ToObject (MonoReflectionType *type, MonoObject *obj) +ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoArray *params) +{ + return mono_runtime_invoke_array (method->method, this, params); +} + +static MonoObject * +ves_icall_InternalExecute (MonoReflectionMethod *method, MonoObject *this, MonoArray *params, MonoArray **outArgs) { MonoDomain *domain = mono_domain_get (); - MonoClass *enumc; - gint32 s1, s2; - MonoObject *res; - - MONO_CHECK_ARG_NULL (domain, type); - MONO_CHECK_ARG_NULL (domain, obj); + MonoMethod *m = method->method; + MonoMethodSignature *sig = m->signature; + MonoArray *out_args; + MonoObject *result; + int i, j, outarg_count = 0; + + if (m->klass == mono_defaults.object_class) { + + if (!strcmp (m->name, "FieldGetter")) { + MonoClass *k = this->vtable->klass; + MonoString *name = mono_array_get (params, MonoString *, 1); + char *str; + + str = mono_string_to_utf8 (name); + + for (i = 0; i < k->field.count; i++) { + if (!strcmp (k->fields [i].name, str)) { + MonoClass *field_klass = mono_class_from_mono_type (k->fields [i].type); + if (field_klass->valuetype) + result = mono_value_box (domain, field_klass, + (char *)this + k->fields [i].offset); + else + result = *((gpointer *)((char *)this + k->fields [i].offset)); + + g_assert (result); + out_args = mono_array_new (domain, mono_defaults.object_class, 1); + *outArgs = out_args; + mono_array_set (out_args, gpointer, 0, result); + g_free (str); + return NULL; + } + } - enumc = mono_class_from_mono_type (type->type); + g_free (str); + g_assert_not_reached (); + + } else if (!strcmp (m->name, "FieldSetter")) { + MonoClass *k = this->vtable->klass; + MonoString *name = mono_array_get (params, MonoString *, 1); + int size, align; + char *str; + + str = mono_string_to_utf8 (name); + + for (i = 0; i < k->field.count; i++) { + if (!strcmp (k->fields [i].name, str)) { + MonoClass *field_klass = mono_class_from_mono_type (k->fields [i].type); + MonoObject *val = mono_array_get (params, gpointer, 2); + + if (field_klass->valuetype) { + size = mono_type_size (k->fields [i].type, &align); + memcpy ((char *)this + k->fields [i].offset, + ((char *)val) + sizeof (MonoObject), size); + } else + *((gpointer *)this + k->fields [i].offset) = val; + + g_assert (result); + g_free (str); + return NULL; + } + } + + g_free (str); + g_assert_not_reached (); + + } + } + + for (i = 0; i < mono_array_length (params); i++) { + if (sig->params [i]->byref) + outarg_count++; + } + + out_args = mono_array_new (domain, mono_defaults.object_class, outarg_count); + + for (i = 0, j = 0; i < mono_array_length (params); i++) { + if (sig->params [i]->byref) { + gpointer arg; + arg = mono_array_get (params, gpointer, i); + mono_array_set (out_args, gpointer, j, arg); + j++; + } + } + + /* fixme: handle constructors? */ + if (!strcmp (method->method->name, ".ctor")) + g_assert_not_reached (); + + result = mono_runtime_invoke_array (method->method, this, params); + + *outArgs = out_args; + + return result; +} + +static MonoObject * +ves_icall_System_Enum_ToObject (MonoReflectionType *type, MonoObject *obj) +{ + MonoDomain *domain = mono_domain_get (); + MonoClass *enumc, *objc; + gint32 s1, s2; + MonoObject *res; + + MONO_CHECK_ARG_NULL (type); + MONO_CHECK_ARG_NULL (obj); - MONO_CHECK_ARG (domain, obj, enumc->enumtype == TRUE); - MONO_CHECK_ARG (domain, obj, obj->vtable->klass->byval_arg.type >= MONO_TYPE_I1 && - obj->vtable->klass->byval_arg.type <= MONO_TYPE_U8); + enumc = mono_class_from_mono_type (type->type); + objc = obj->vtable->klass; + MONO_CHECK_ARG (obj, enumc->enumtype == TRUE); + MONO_CHECK_ARG (obj, (objc->enumtype) || (objc->byval_arg.type >= MONO_TYPE_I1 && + objc->byval_arg.type <= MONO_TYPE_U8)); s1 = mono_class_value_size (enumc, NULL); - s2 = mono_class_value_size (obj->vtable->klass, NULL); + s2 = mono_class_value_size (objc, NULL); res = mono_object_new (domain, enumc); #if G_BYTE_ORDER == G_LITTLE_ENDIAN - memcpy ((gpointer)res + sizeof (MonoObject), (gpointer)obj + sizeof (MonoObject), MIN (s1, s2)); + memcpy ((char *)res + sizeof (MonoObject), (char *)obj + sizeof (MonoObject), MIN (s1, s2)); #else - memcpy ((gpointer)res + sizeof (MonoObject) + (s1 > s2 ? s1 - s2 : 0), - (gpointer)obj + sizeof (MonoObject) + (s2 > s1 ? s2 - s1 : 0), + memcpy ((char *)res + sizeof (MonoObject) + (s1 > s2 ? s1 - s2 : 0), + (char *)obj + sizeof (MonoObject) + (s2 > s1 ? s2 - s1 : 0), MIN (s1, s2)); #endif return res; @@ -567,8 +1067,8 @@ ves_icall_System_Enum_get_value (MonoObject *this) enumc = mono_class_from_mono_type (this->vtable->klass->enum_basetype); res = mono_object_new (domain, enumc); - dst = (gpointer)res + sizeof (MonoObject); - src = (gpointer)this + sizeof (MonoObject); + dst = (char *)res + sizeof (MonoObject); + src = (char *)this + sizeof (MonoObject); size = mono_class_value_size (enumc, NULL); memcpy (dst, src, size); @@ -587,7 +1087,7 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info) info->utype = mono_type_get_object (domain, enumc->enum_basetype); nvalues = enumc->field.count - 1; info->names = mono_array_new (domain, mono_defaults.string_class, nvalues); - info->values = mono_array_new (domain, mono_class_from_mono_type (enumc->enum_basetype), nvalues); + info->values = mono_array_new (domain, enumc, nvalues); for (i = 0, j = 0; i < enumc->field.count; ++i) { field = &enumc->fields [i]; @@ -626,7 +1126,7 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info) } static MonoMethod* -search_method (MonoReflectionType *type, char *name, guint32 flags, MonoArray *args) +search_method (MonoReflectionType *type, const char *name, guint32 flags, MonoArray *args) { MonoClass *klass, *start_class; MonoMethod *m; @@ -730,133 +1230,297 @@ 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; +} + +static MonoArray* +ves_icall_Type_GetMethods (MonoReflectionType *type, guint32 bflags) +{ + MonoDomain *domain; + GSList *l = NULL, *tmp; + static MonoClass *System_Reflection_MethodInfo; + 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") == 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; + match = 0; + member = (MonoObject*)mono_method_get_object (domain, method); + + 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; +} -/* - * Note: the filter is applied from within corlib. - */ static MonoArray* -ves_icall_type_find_members (MonoReflectionType *type, guint32 membertypes, guint32 bflags) +ves_icall_Type_GetConstructors (MonoReflectionType *type, guint32 bflags) { MonoDomain *domain; GSList *l = NULL, *tmp; - static MonoClass *System_Reflection_MemberInfo; + static MonoClass *System_Reflection_ConstructorInfo; 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 (!match) - continue; - match = 0; - 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") && 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; - match = 0; - member = (MonoObject*)mono_method_get_object (domain, method); + if (!match) + continue; + 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 (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 (!match) - continue; - match = 0; - 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) { - 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 (!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; +} - if (!match) - continue; - match = 0; - l = g_slist_prepend (l, mono_property_get_object (domain, klass, prop)); +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) @@ -865,6 +1529,46 @@ handle_parent: return res; } +static MonoArray* +ves_icall_Type_GetNestedTypes (MonoReflectionType *type, guint32 bflags) +{ + MonoDomain *domain; + GSList *l = NULL, *tmp; + GList *tmpn; + MonoClass *startklass, *klass; + MonoArray *res; + MonoObject *member; + int i, len, match; + MonoClass *nested; + + domain = ((MonoObject *)type)->vtable->domain; + klass = startklass = mono_class_from_mono_type (type->type); + + for (tmpn = klass->nested_classes; tmpn; tmpn = tmpn->next) { + match = 0; + nested = tmpn->data; + if ((nested->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK) == TYPE_ATTRIBUTE_NESTED_PUBLIC) { + if (bflags & BFLAGS_Public) + match++; + } else { + if (bflags & BFLAGS_NonPublic) + match++; + } + if (!match) + continue; + member = (MonoObject*)mono_type_get_object (domain, &nested->byval_arg); + l = g_slist_prepend (l, member); + } + len = g_slist_length (l); + res = mono_array_new (domain, mono_defaults.monotype_class, 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; +} + static gpointer ves_icall_System_Runtime_InteropServices_Marshal_ReadIntPtr (gpointer ptr) { @@ -885,66 +1589,36 @@ 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 ()); + /*g_print ("failed parse\n");*/ + 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 ()); + /* g_print ("failed find\n"); */ return NULL; } - if (!klass->inited) - mono_class_init (klass); + /* g_print ("got it\n"); */ + return mono_type_get_object (domain, type); - 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);*/ - } - - if (byref || ispointer) - return mono_type_get_object (domain, &klass->this_arg); - else - return mono_type_get_object (domain, &klass->byval_arg); } static MonoString * @@ -961,50 +1635,125 @@ ves_icall_System_Reflection_Assembly_get_code_base (MonoReflectionAssembly *asse } static MonoString * -ves_icall_System_MonoType_assQualifiedName (MonoReflectionType *object) +ves_icall_System_MonoType_getFullName (MonoReflectionType *object) { MonoDomain *domain = mono_domain_get (); - /* FIXME : real rules are more complicated (internal classes, - reference types, array types, etc. */ MonoString *res; - gchar *fullname; - MonoClass *klass; - char *append = NULL; + gchar *name; - switch (object->type->type) { - case MONO_TYPE_SZARRAY: - klass = object->type->data.type->data.klass; - append = "[]"; - break; - case MONO_TYPE_PTR: - klass = object->type->data.type->data.klass; - append = "*"; - break; - default: - klass = object->type->data.klass; - break; - } - - fullname = g_strconcat (klass->name_space, ".", - klass->name, ",", - klass->image->assembly_name, append, NULL); - res = mono_string_new (domain, fullname); - g_free (fullname); + name = mono_type_get_name (object->type); + res = mono_string_new (domain, name); + g_free (name); return res; } -static MonoString * -ves_icall_System_PAL_GetCurrentDirectory (MonoObject *object) +static void +ves_icall_System_Reflection_Assembly_FillName (MonoReflectionAssembly *assembly, MonoReflectionAssemblyName *aname) +{ + MonoAssemblyName *name = &assembly->assembly->aname; + + if (strcmp (name->name, "corlib") == 0) + aname->name = mono_string_new (mono_object_domain (assembly), "mscorlib"); + else + aname->name = mono_string_new (mono_object_domain (assembly), name->name); + aname->major = name->major; +} + +static MonoArray* +ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssembly *assembly, MonoBoolean exportedOnly) { MonoDomain *domain = mono_domain_get (); - MonoString *res; - gchar *path = g_get_current_dir (); - res = mono_string_new (domain, path); - g_free (path); + MonoArray *res; + MonoClass *klass; + MonoTableInfo *tdef = &assembly->assembly->image->tables [MONO_TABLE_TYPEDEF]; + int i, count; + guint32 attrs, visibility; + + if (exportedOnly) { + count = 0; + for (i = 0; i < tdef->rows; ++i) { + attrs = mono_metadata_decode_row_col (tdef, i, MONO_TYPEDEF_FLAGS); + visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK; + if (visibility == TYPE_ATTRIBUTE_PUBLIC || visibility == TYPE_ATTRIBUTE_NESTED_PUBLIC) + count++; + } + } else { + count = tdef->rows; + } + res = mono_array_new (domain, mono_defaults.monotype_class, count); + count = 0; + for (i = 0; i < tdef->rows; ++i) { + attrs = mono_metadata_decode_row_col (tdef, i, MONO_TYPEDEF_FLAGS); + visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK; + if (!exportedOnly || (visibility == TYPE_ATTRIBUTE_PUBLIC || visibility == TYPE_ATTRIBUTE_NESTED_PUBLIC)) { + klass = mono_class_get (assembly->assembly->image, (i + 1) | MONO_TOKEN_TYPE_DEF); + mono_array_set (res, gpointer, count, mono_type_get_object (domain, &klass->byval_arg)); + count++; + } + } + 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 */ + g_free (str); + return NULL; + } + isbyref = 1; + p++; + g_free (str); + 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 */ + g_free (str); + return NULL; + } + ++p; + } + if (*p != ']') { + g_free (str); + 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); +} + /* * Magic number to convert a time which is relative to * Jan 1, 1970 into a value which is relative to Jan 1, 0001. @@ -1012,9 +1761,16 @@ ves_icall_System_PAL_GetCurrentDirectory (MonoObject *object) #define EPOCH_ADJUST ((gint64)62135596800L) static gint64 -ves_icall_System_DateTime_GetNow () +ves_icall_System_DateTime_GetNow (void) { -#ifndef PLATFORM_WIN32 +#ifdef PLATFORM_WIN32 + SYSTEMTIME st; + FILETIME ft; + + GetLocalTime (&st); + SystemTimeToFileTime (&st, &ft); + return (gint64)504911232000000000L + (((gint64)ft.dwHighDateTime)<<32) | ft.dwLowDateTime; +#else /* FIXME: put this in io-layer and call it GetLocalTime */ struct timeval tv; gint64 res; @@ -1023,18 +1779,356 @@ ves_icall_System_DateTime_GetNow () res = (((gint64)tv.tv_sec + EPOCH_ADJUST)* 1000000 + tv.tv_usec)*10; return res; } - /* fixme: raise exception */ + return 0; +#endif +} + +/* + * 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); +#if defined (HAVE_TIMEZONE) +#define gmt_offset(x) (-1 * (((timezone / 60 / 60) - daylight) * 100)) +#elif defined (HAVE_TM_GMTOFF) +#define gmt_offset(x) x.tm_gmtoff +#else +#error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc. #endif + + gmtoff = gmt_offset (start); + + 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 (gmt_offset (tt) != gmtoff) { + char tzone[10]; + 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 (gmt_offset (tt1) != gmtoff); + + /* Try to find the exact minute when daylight saving starts/ends. */ + do { + t1 += 60; + tt1 = *localtime (&t1); + } while (gmt_offset (tt1) == gmtoff); + + strftime (tzone, 10, "%Z", &tt); + + /* 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, tzone)); + mono_array_set ((*data), gint64, 1, ((gint64)t1 + EPOCH_ADJUST) * 10000000L); + return 1; + } else { + mono_array_set ((*names), gpointer, 1, mono_string_new (domain, tzone)); + 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)(gmt_offset (tt) - gmtoff) * 10000000L); + + gmtoff = gmt_offset (tt); + } + + gmtoff = gmt_offset (tt); + } + return 1; +#else + MonoDomain *domain = mono_domain_get (); + TIME_ZONE_INFORMATION tz_info; + FILETIME ft; + int i; + + GetTimeZoneInformation (&tz_info); + + 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 (i = 0; i < 32; ++i) + if (!tz_info.DaylightName [i]) + break; + mono_array_set ((*names), gpointer, 1, mono_string_new_utf16 (domain, tz_info.DaylightName, i)); + for (i = 0; i < 32; ++i) + if (!tz_info.StandardName [i]) + break; + mono_array_set ((*names), gpointer, 0, mono_string_new_utf16 (domain, tz_info.StandardName, i)); + + SystemTimeToFileTime (&tz_info.StandardDate, &ft); + mono_array_set ((*data), gint64, 1, ((guint64)ft.dwHighDateTime<<32) | ft.dwLowDateTime); + SystemTimeToFileTime (&tz_info.DaylightDate, &ft); + mono_array_set ((*data), gint64, 0, ((guint64)ft.dwHighDateTime<<32) | ft.dwLowDateTime); + mono_array_set ((*data), gint64, 3, tz_info.Bias + tz_info.StandardBias); + mono_array_set ((*data), gint64, 2, tz_info.Bias + tz_info.DaylightBias); + + return 1; +#endif +} + +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; + + if (array->bounds == NULL) + length = array->max_length; + else { + 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 idx) { + return mono_array_get (array, gint8, idx); +} + +static void +ves_icall_System_Buffer_SetByteInternal (MonoArray *array, gint32 idx, gint8 value) { + mono_array_set (array, gint8, idx, 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); +} + +static MonoObject * +ves_icall_Remoting_RealProxy_GetTransparentProxy (MonoObject *this) +{ + MonoDomain *domain = mono_domain_get (); + MonoObject *res; + MonoRealProxy *rp = ((MonoRealProxy *)this); + MonoType *type; + MonoClass *klass; + + res = mono_object_new (domain, mono_defaults.transparent_proxy_class); + + ((MonoTransparentProxy *)res)->rp = rp; + type = ((MonoReflectionType *)rp->class_to_proxy)->type; + klass = mono_class_from_mono_type (type); + + ((MonoTransparentProxy *)res)->klass = klass; + + res->vtable = mono_class_proxy_vtable (domain, klass); + + return res; +} + +/* System.Environment */ + +static MonoString * +ves_icall_System_Environment_get_MachineName (void) +{ +#if defined (PLATFORM_WIN32) + gunichar2 *buf; + guint32 len; + MonoString *result; + + len = MAX_COMPUTERNAME_LENGTH + 1; + buf = g_new (gunichar2, len); + + result = NULL; + if (GetComputerName (buf, &len)) + result = mono_string_new_utf16 (mono_domain_get (), buf, len); + + g_free (buf); + return result; +#else + gchar *buf; + int len; + MonoString *result; + + len = 256; + buf = g_new (gchar, len); + + result = NULL; + if (gethostname (buf, len) != 0) + result = mono_string_new (mono_domain_get (), buf); + + g_free (buf); + return result; +#endif +} + +static MonoString * +ves_icall_System_Environment_get_NewLine (void) +{ +#if defined (PLATFORM_WIN32) + return mono_string_new (mono_domain_get (), "\r\n"); +#else + return mono_string_new (mono_domain_get (), "\n"); +#endif +} + +static MonoString * +ves_icall_System_Environment_GetEnvironmentVariable (MonoString *name) +{ + const gchar *value; + gchar *utf8_name; + + if (name == NULL) + return NULL; + + utf8_name = mono_string_to_utf8 (name); /* FIXME: this should be ascii */ + value = g_getenv (utf8_name); + g_free (utf8_name); + + if (value == 0) + return NULL; + + return mono_string_new (mono_domain_get (), value); +} + +/* + * There is no standard way to get at environ. + */ +extern char **environ; + +static MonoArray * +ves_icall_System_Environment_GetEnvironmentVariableNames (void) +{ + MonoArray *names; + MonoDomain *domain; + MonoString *str; + gchar **e, **parts; + int n; + + n = 0; + for (e = environ; *e != 0; ++ e) + ++ n; + + domain = mono_domain_get (); + names = mono_array_new (domain, mono_defaults.string_class, n); + + n = 0; + for (e = environ; *e != 0; ++ e) { + parts = g_strsplit (*e, "=", 2); + if (*parts != 0) { + str = mono_string_new (domain, *parts); + mono_array_set (names, MonoString *, n, str); + } + + g_strfreev (parts); + + ++ n; + } + + return names; +} + +static void +ves_icall_System_Environment_Exit (int result) +{ + /* we may need to do some cleanup here... */ + exit (result); +} + +static void +ves_icall_MonoMethodMessage_InitMessage (MonoMethodMessage *this, + MonoReflectionMethod *method, + MonoArray *out_args) +{ + MonoDomain *domain = mono_domain_get (); + + mono_message_init (domain, this, method, out_args); +} + +static MonoBoolean +ves_icall_IsTransparentProxy (MonoObject *proxy) +{ + if (!proxy) + return 0; + + if (proxy->vtable->klass == mono_defaults.transparent_proxy_class) + return 1; + return 0; } -static gpointer icall_map [] = { + +/* icall map */ + +static gconstpointer 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, @@ -1047,12 +2141,53 @@ static gpointer icall_map [] = { */ "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.ValueType::Equals", ves_icall_System_ValueType_Equals, /* * System.String */ - "System.String::IsInterned", mono_string_is_interned, - "System.String::Intern", mono_string_intern, + + "System.String::.ctor(char*)", ves_icall_System_String_ctor_charp, + "System.String::.ctor(char*,uint,uint)", ves_icall_System_String_ctor_charp_int_int, + "System.String::.ctor(sbyte*)", ves_icall_System_String_ctor_sbytep, + "System.String::.ctor(sbyte*,uint,uint)", ves_icall_System_String_ctor_sbytep_int_int, + "System.String::.ctor(sbyte*,uint,uint,System.Text.Encoding)", ves_icall_System_String_ctor_encoding, + "System.String::.ctor(char[])", ves_icall_System_String_ctor_chara, + "System.String::.ctor(char[],uint,uint)", ves_icall_System_String_ctor_chara_int_int, + "System.String::.ctor(char,uint)", ves_icall_System_String_ctor_char_int, + "System.String::InternalEquals", ves_icall_System_String_InternalEquals, + "System.String::InternalJoin", ves_icall_System_String_InternalJoin, + "System.String::InternalInsert", ves_icall_System_String_InternalInsert, + "System.String::InternalReplace(char,char)", ves_icall_System_String_InternalReplace_Char, + "System.String::InternalReplace(string,string)", ves_icall_System_String_InternalReplace_Str, + "System.String::InternalRemove", ves_icall_System_String_InternalRemove, + "System.String::InternalCopyTo", ves_icall_System_String_InternalCopyTo, + "System.String::InternalSplit", ves_icall_System_String_InternalSplit, + "System.String::InternalTrim", ves_icall_System_String_InternalTrim, + "System.String::InternalIndexOf(char,uint,uint)", ves_icall_System_String_InternalIndexOf_Char, + "System.String::InternalIndexOf(string,uint,uint)", ves_icall_System_String_InternalIndexOf_Str, + "System.String::InternalIndexOfAny", ves_icall_System_String_InternalIndexOfAny, + "System.String::InternalLastIndexOf(char,uint,uint)", ves_icall_System_String_InternalLastIndexOf_Char, + "System.String::InternalLastIndexOf(string,uint,uint)", ves_icall_System_String_InternalLastIndexOf_Str, + "System.String::InternalLastIndexOfAny", ves_icall_System_String_InternalLastIndexOfAny, + "System.String::InternalPad", ves_icall_System_String_InternalPad, + "System.String::InternalToLower", ves_icall_System_String_InternalToLower, + "System.String::InternalToUpper", ves_icall_System_String_InternalToUpper, + "System.String::InternalAllocateStr", ves_icall_System_String_InternalAllocateStr, + "System.String::InternalStrcpy(string,uint,string)", ves_icall_System_String_InternalStrcpy_Str, + "System.String::InternalStrcpy(string,uint,string,uint,uint)", ves_icall_System_String_InternalStrcpy_StrN, + "System.String::InternalIntern", ves_icall_System_String_InternalIntern, + "System.String::InternalIsInterned", ves_icall_System_String_InternalIsInterned, + "System.String::InternalCompare(string,uint,string,uint,uint,bool)", ves_icall_System_String_InternalCompareStr_N, + "System.String::GetHashCode", ves_icall_System_String_GetHashCode, + "System.String::get_Chars", ves_icall_System_String_get_Chars, /* * System.AppDomain @@ -1073,6 +2208,11 @@ static gpointer icall_map [] = { */ "System.AppDomainSetup::InitAppDomainSetup", ves_icall_System_AppDomainSetup_InitAppDomainSetup, + /* + * System.Double + */ + "System.Double::ToStringImpl", mono_double_ToStringImpl, + /* * System.Decimal */ @@ -1094,13 +2234,16 @@ 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::getDataChunk", ves_icall_AssemblyBuilder_getDataChunk, + "System.Reflection.Emit.AssemblyBuilder::getPEHeader", ves_icall_AssemblyBuilder_getPEHeader, "System.Reflection.Emit.AssemblyBuilder::getUSIndex", mono_image_insert_string, "System.Reflection.Emit.AssemblyBuilder::getToken", ves_icall_AssemblyBuilder_getToken, + "System.Reflection.Emit.AssemblyBuilder::basic_init", mono_image_basic_init, /* * Reflection stuff. @@ -1110,9 +2253,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 */ @@ -1123,6 +2270,8 @@ static gpointer icall_map [] = { /* * TypeBuilder */ + "System.Reflection.Emit.TypeBuilder::setup_internal_class", mono_reflection_setup_internal_class, + /* * MethodBuilder @@ -1139,7 +2288,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 @@ -1150,9 +2298,11 @@ static gpointer icall_map [] = { * System.Threading */ "System.Threading.Thread::Thread_internal", ves_icall_System_Threading_Thread_Thread_internal, + "System.Threading.Thread::Thread_free_internal", ves_icall_System_Threading_Thread_Thread_free_internal, "System.Threading.Thread::Start_internal", ves_icall_System_Threading_Thread_Start_internal, "System.Threading.Thread::Sleep_internal", ves_icall_System_Threading_Thread_Sleep_internal, "System.Threading.Thread::CurrentThread_internal", ves_icall_System_Threading_Thread_CurrentThread_internal, + "System.Threading.Thread::CurrentThreadDomain_internal", ves_icall_System_Threading_Thread_CurrentThreadDomain_internal, "System.Threading.Thread::Join_internal", ves_icall_System_Threading_Thread_Join_internal, "System.Threading.Thread::SlotHash_lookup", ves_icall_System_Threading_Thread_SlotHash_lookup, "System.Threading.Thread::SlotHash_store", ves_icall_System_Threading_Thread_SlotHash_store, @@ -1180,32 +2330,26 @@ static gpointer icall_map [] = { "System.Runtime.InteropServices.Marshal::PtrToStringAuto", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAuto, "System.Runtime.InteropServices.Marshal::GetLastWin32Error", ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error, + "System.Reflection.Assembly::LoadFrom", ves_icall_System_Reflection_Assembly_LoadFrom, "System.Reflection.Assembly::GetType", ves_icall_System_Reflection_Assembly_GetType, + "System.Reflection.Assembly::GetTypes", ves_icall_System_Reflection_Assembly_GetTypes, + "System.Reflection.Assembly::FillName", ves_icall_System_Reflection_Assembly_FillName, "System.Reflection.Assembly::get_code_base", ves_icall_System_Reflection_Assembly_get_code_base, /* * System.MonoType. */ - "System.MonoType::assQualifiedName", ves_icall_System_MonoType_assQualifiedName, + "System.MonoType::getFullName", ves_icall_System_MonoType_getFullName, "System.MonoType::type_from_obj", mono_type_type_from_obj, + "System.MonoType::GetElementType", ves_icall_MonoType_GetElementType, "System.MonoType::get_type_info", ves_icall_get_type_info, - - "System.PAL.OpSys::GetCurrentDirectory", ves_icall_System_PAL_GetCurrentDirectory, - - /* - * 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, - "System.PAL.OpSys::SetFileTime", ves_icall_System_PAL_OpSys_SetFileTime, + "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.MonoType::GetNestedTypes", ves_icall_Type_GetNestedTypes, /* * System.Net.Sockets I/O Services @@ -1261,13 +2405,141 @@ 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.GC + */ + "System.GC::InternalCollect", ves_icall_System_GC_InternalCollect, + "System.GC::GetTotalMemory", ves_icall_System_GC_GetTotalMemory, + "System.GC::KeepAlive", ves_icall_System_GC_KeepAlive, + "System.GC::ReRegisterForFinalize", ves_icall_System_GC_ReRegisterForFinalize, + "System.GC::SuppressFinalize", ves_icall_System_GC_SuppressFinalize, + "System.GC::WaitForPendingFinalizers", ves_icall_System_GC_WaitForPendingFinalizers, /* * 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.Security.Cryptography.RNGCryptoServiceProvider::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.MonoIO + */ + "System.IO.MonoIO::GetLastError", ves_icall_System_IO_MonoIO_GetLastError, + "System.IO.MonoIO::CreateDirectory", ves_icall_System_IO_MonoIO_CreateDirectory, + "System.IO.MonoIO::RemoveDirectory", ves_icall_System_IO_MonoIO_RemoveDirectory, + "System.IO.MonoIO::FindFirstFile", ves_icall_System_IO_MonoIO_FindFirstFile, + "System.IO.MonoIO::FindNextFile", ves_icall_System_IO_MonoIO_FindNextFile, + "System.IO.MonoIO::FindClose", ves_icall_System_IO_MonoIO_FindClose, + "System.IO.MonoIO::GetCurrentDirectory", ves_icall_System_IO_MonoIO_GetCurrentDirectory, + "System.IO.MonoIO::SetCurrentDirectory", ves_icall_System_IO_MonoIO_SetCurrentDirectory, + "System.IO.MonoIO::MoveFile", ves_icall_System_IO_MonoIO_MoveFile, + "System.IO.MonoIO::CopyFile", ves_icall_System_IO_MonoIO_CopyFile, + "System.IO.MonoIO::DeleteFile", ves_icall_System_IO_MonoIO_DeleteFile, + "System.IO.MonoIO::GetFileAttributes", ves_icall_System_IO_MonoIO_GetFileAttributes, + "System.IO.MonoIO::SetFileAttributes", ves_icall_System_IO_MonoIO_SetFileAttributes, + "System.IO.MonoIO::GetFileStat", ves_icall_System_IO_MonoIO_GetFileStat, + "System.IO.MonoIO::Open", ves_icall_System_IO_MonoIO_Open, + "System.IO.MonoIO::Close", ves_icall_System_IO_MonoIO_Close, + "System.IO.MonoIO::Read", ves_icall_System_IO_MonoIO_Read, + "System.IO.MonoIO::Write", ves_icall_System_IO_MonoIO_Write, + "System.IO.MonoIO::Seek", ves_icall_System_IO_MonoIO_Seek, + "System.IO.MonoIO::GetLength", ves_icall_System_IO_MonoIO_GetLength, + "System.IO.MonoIO::SetLength", ves_icall_System_IO_MonoIO_SetLength, + "System.IO.MonoIO::SetFileTime", ves_icall_System_IO_MonoIO_SetFileTime, + "System.IO.MonoIO::Flush", ves_icall_System_IO_MonoIO_Flush, + "System.IO.MonoIO::get_ConsoleOutput", ves_icall_System_IO_MonoIO_get_ConsoleOutput, + "System.IO.MonoIO::get_ConsoleInput", ves_icall_System_IO_MonoIO_get_ConsoleInput, + "System.IO.MonoIO::get_ConsoleError", ves_icall_System_IO_MonoIO_get_ConsoleError, + "System.IO.MonoIO::get_VolumeSeparatorChar", ves_icall_System_IO_MonoIO_get_VolumeSeparatorChar, + "System.IO.MonoIO::get_DirectorySeparatorChar", ves_icall_System_IO_MonoIO_get_DirectorySeparatorChar, + "System.IO.MonoIO::get_AltDirectorySeparatorChar", ves_icall_System_IO_MonoIO_get_AltDirectorySeparatorChar, + "System.IO.MonoIO::get_PathSeparator", ves_icall_System_IO_MonoIO_get_PathSeparator, + "System.IO.MonoIO::get_InvalidPathChars", ves_icall_System_IO_MonoIO_get_InvalidPathChars, + + /* + * 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, + + /* + * System.Environment + */ + "System.Environment::get_MachineName", ves_icall_System_Environment_get_MachineName, + "System.Environment::get_NewLine", ves_icall_System_Environment_get_NewLine, + "System.Environment::GetEnvironmentVariable", ves_icall_System_Environment_GetEnvironmentVariable, + "System.Environment::GetEnvironmentVariableNames", ves_icall_System_Environment_GetEnvironmentVariableNames, + "System.Environment::GetCommandLineArgs", mono_runtime_get_main_args, + "System.Environment::Exit", ves_icall_System_Environment_Exit, + + /* + * 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, + + + /* + * System.Runtime.Remoting + */ + "System.Runtime.Remoting.RemotingServices::InternalExecute", + ves_icall_InternalExecute, + "System.Runtime.Remoting.RemotingServices::IsTransparentProxy", + ves_icall_IsTransparentProxy, + + /* + * System.Runtime.Remoting.Messaging + */ + "System.Runtime.Remoting.Messaging.MonoMethodMessage::InitMessage", + ves_icall_MonoMethodMessage_InitMessage, + + /* + * System.Runtime.Remoting.Proxies + */ + "System.Runtime.Remoting.Proxies.RealProxy::GetTransparentProxy", + ves_icall_Remoting_RealProxy_GetTransparentProxy, + + /* + * System.Threading.Interlocked + */ + "System.Threading.Interlocked::Increment(uint&)", ves_icall_System_Threading_Interlocked_Increment_Int, + "System.Threading.Interlocked::Increment(long&)", ves_icall_System_Threading_Interlocked_Increment_Long, + "System.Threading.Interlocked::Decrement(uint&)", ves_icall_System_Threading_Interlocked_Decrement_Int, + "System.Threading.Interlocked::Decrement(long&)", ves_icall_System_Threading_Interlocked_Decrement_Long, + "System.Threading.Interlocked::CompareExchange(uint&,uint,uint)", ves_icall_System_Threading_Interlocked_CompareExchange_Int, + "System.Threading.Interlocked::CompareExchange(object&,object,object)", ves_icall_System_Threading_Interlocked_CompareExchange_Object, + "System.Threading.Interlocked::CompareExchange(single&,single,single)", ves_icall_System_Threading_Interlocked_CompareExchange_Single, + "System.Threading.Interlocked::Exchange(uint&,uint)", ves_icall_System_Threading_Interlocked_Exchange_Int, + "System.Threading.Interlocked::Exchange(object&,object)", ves_icall_System_Threading_Interlocked_Exchange_Object, + "System.Threading.Interlocked::Exchange(single&,single)", ves_icall_System_Threading_Interlocked_Exchange_Single, /* * add other internal calls here @@ -1276,13 +2548,13 @@ static gpointer icall_map [] = { }; void -mono_init_icall () +mono_init_icall (void) { - char *n; + const char *name; int i = 0; - while ((n = icall_map [i])) { - mono_add_internal_call (n, icall_map [i+1]); + while ((name = icall_map [i])) { + mono_add_internal_call (name, icall_map [i+1]); i += 2; }