X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fmetadata.c;h=126f8708a4fabb8dc325a2216ca430ec87d02814;hb=ee3f6b1da9ebc378ca91c26ce161003e60586a83;hp=c8f698571b84b9a0137c81bddf31ff6c7ccc4833;hpb=5bbfa8860b090e465a3aa45edeb9c94481ef1a22;p=mono.git diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c index c8f698571b8..126f8708a4f 100644 --- a/mono/metadata/metadata.c +++ b/mono/metadata/metadata.c @@ -175,7 +175,11 @@ const static unsigned char TableSchemas [] = { MONO_MT_TABLE_IDX, /* "EventType" }, TypeDef or TypeRef */ MONO_MT_END, -#define EXPORTED_TYPE_SCHEMA_OFFSET EVENT_SCHEMA_OFFSET + 4 +#define EVENT_POINTER_SCHEMA_OFFSET EVENT_SCHEMA_OFFSET + 4 + MONO_MT_TABLE_IDX, /* "Event" }, */ + MONO_MT_END, + +#define EXPORTED_TYPE_SCHEMA_OFFSET EVENT_POINTER_SCHEMA_OFFSET + 2 MONO_MT_UINT32, /* "Flags" }, */ MONO_MT_TABLE_IDX, /* "TypeDefId" }, */ MONO_MT_STRING_IDX, /* "TypeName" }, */ @@ -204,7 +208,11 @@ const static unsigned char TableSchemas [] = { MONO_MT_TABLE_IDX, /* "Field:Field" }, */ MONO_MT_END, -#define FILE_SCHEMA_OFFSET FIELD_RVA_SCHEMA_OFFSET + 3 +#define FIELD_POINTER_SCHEMA_OFFSET FIELD_RVA_SCHEMA_OFFSET + 3 + MONO_MT_TABLE_IDX, /* "Field" }, */ + MONO_MT_END, + +#define FILE_SCHEMA_OFFSET FIELD_POINTER_SCHEMA_OFFSET + 2 MONO_MT_UINT32, /* "Flags" }, */ MONO_MT_STRING_IDX, /* "Name" }, */ MONO_MT_BLOB_IDX, /* "Value" }, */ @@ -256,7 +264,11 @@ const static unsigned char TableSchemas [] = { MONO_MT_HS_IDX, /* "Association" }, */ MONO_MT_END, -#define MODULE_SCHEMA_OFFSET METHOD_SEMA_SCHEMA_OFFSET + 4 +#define METHOD_POINTER_SCHEMA_OFFSET METHOD_SEMA_SCHEMA_OFFSET + 4 + MONO_MT_TABLE_IDX, /* "Method" }, */ + MONO_MT_END, + +#define MODULE_SCHEMA_OFFSET METHOD_POINTER_SCHEMA_OFFSET + 2 MONO_MT_UINT16, /* "Generation" }, */ MONO_MT_STRING_IDX, /* "Name" }, */ MONO_MT_GUID_IDX, /* "MVID" }, */ @@ -279,13 +291,21 @@ const static unsigned char TableSchemas [] = { MONO_MT_STRING_IDX, /* "Name" }, */ MONO_MT_END, -#define PROPERTY_SCHEMA_OFFSET PARAM_SCHEMA_OFFSET + 4 +#define PARAM_POINTER_SCHEMA_OFFSET PARAM_SCHEMA_OFFSET + 4 + MONO_MT_TABLE_IDX, /* "Param" }, */ + MONO_MT_END, + +#define PROPERTY_SCHEMA_OFFSET PARAM_POINTER_SCHEMA_OFFSET + 2 MONO_MT_UINT16, /* "Flags" }, */ MONO_MT_STRING_IDX, /* "Name" }, */ MONO_MT_BLOB_IDX, /* "Type" }, */ MONO_MT_END, -#define PROPERTY_MAP_SCHEMA_OFFSET PROPERTY_SCHEMA_OFFSET + 4 +#define PROPERTY_POINTER_SCHEMA_OFFSET PROPERTY_SCHEMA_OFFSET + 4 + MONO_MT_TABLE_IDX, /* "Property" }, */ + MONO_MT_END, + +#define PROPERTY_MAP_SCHEMA_OFFSET PROPERTY_POINTER_SCHEMA_OFFSET + 2 MONO_MT_TABLE_IDX, /* "Parent:TypeDef" }, */ MONO_MT_TABLE_IDX, /* "PropertyList:Property" }, */ MONO_MT_END, @@ -340,11 +360,11 @@ table_description [] = { MODULE_SCHEMA_OFFSET, TYPEREF_SCHEMA_OFFSET, TYPEDEF_SCHEMA_OFFSET, - NULL_SCHEMA_OFFSET, + FIELD_POINTER_SCHEMA_OFFSET, FIELD_SCHEMA_OFFSET, - NULL_SCHEMA_OFFSET, + METHOD_POINTER_SCHEMA_OFFSET, METHOD_SCHEMA_OFFSET, - NULL_SCHEMA_OFFSET, + PARAM_POINTER_SCHEMA_OFFSET, PARAM_SCHEMA_OFFSET, IFACEMAP_SCHEMA_OFFSET, MEMBERREF_SCHEMA_OFFSET, /* 0xa */ @@ -356,10 +376,10 @@ table_description [] = { FIELD_LAYOUT_SCHEMA_OFFSET, /* 0x10 */ STDALON_SIG_SCHEMA_OFFSET, EVENTMAP_SCHEMA_OFFSET, - NULL_SCHEMA_OFFSET, + EVENT_POINTER_SCHEMA_OFFSET, EVENT_SCHEMA_OFFSET, PROPERTY_MAP_SCHEMA_OFFSET, - NULL_SCHEMA_OFFSET, + PROPERTY_POINTER_SCHEMA_OFFSET, PROPERTY_SCHEMA_OFFSET, METHOD_SEMA_SCHEMA_OFFSET, METHOD_IMPL_SCHEMA_OFFSET, @@ -512,6 +532,9 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit field_size = MAX (idx_size (MONO_TABLE_TYPEDEF), idx_size(MONO_TABLE_TYPEREF)); field_size = MAX (field_size, idx_size(MONO_TABLE_TYPESPEC)); break; + case MONO_TABLE_EVENT_POINTER: + g_assert (i == 0); + field_size = idx_size (MONO_TABLE_EVENT); break; case MONO_TABLE_EXPORTEDTYPE: g_assert (i == 1); /* the index is in another metadata file, so it must be 4 */ @@ -522,6 +545,9 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit case MONO_TABLE_FIELDRVA: g_assert (i == 1); field_size = idx_size (MONO_TABLE_FIELD); break; + case MONO_TABLE_FIELD_POINTER: + g_assert (i == 0); + field_size = idx_size (MONO_TABLE_FIELD); break; case MONO_TABLE_IMPLMAP: g_assert (i == 3); field_size = idx_size (MONO_TABLE_MODULEREF); break; @@ -537,14 +563,23 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit case MONO_TABLE_METHODSEMANTICS: g_assert (i == 1); field_size = idx_size (MONO_TABLE_METHOD); break; + case MONO_TABLE_METHOD_POINTER: + g_assert (i == 0); + field_size = idx_size (MONO_TABLE_METHOD); break; case MONO_TABLE_NESTEDCLASS: g_assert (i == 0 || i == 1); field_size = idx_size (MONO_TABLE_TYPEDEF); break; + case MONO_TABLE_PARAM_POINTER: + g_assert (i == 0); + field_size = idx_size (MONO_TABLE_PARAM); break; case MONO_TABLE_PROPERTYMAP: g_assert (i == 0 || i == 1); field_size = i ? idx_size (MONO_TABLE_PROPERTY): idx_size(MONO_TABLE_TYPEDEF); break; + case MONO_TABLE_PROPERTY_POINTER: + g_assert (i == 0); + field_size = idx_size (MONO_TABLE_PROPERTY); break; case MONO_TABLE_TYPEDEF: g_assert (i == 4 || i == 5); field_size = i == 4 ? idx_size (MONO_TABLE_FIELD): @@ -886,13 +921,13 @@ mono_metadata_guid_heap (MonoImage *meta, guint32 index) return meta->heap_guid.data + index; } -static const char * -dword_align (const char *ptr) +static const unsigned char * +dword_align (const unsigned char *ptr) { #if SIZEOF_VOID_P == 8 - return (const char *) (((guint64) (ptr + 3)) & ~3); + return (const unsigned char *) (((guint64) (ptr + 3)) & ~3); #else - return (const char *) (((guint32) (ptr + 3)) & ~3); + return (const unsigned char *) (((guint32) (ptr + 3)) & ~3); #endif } @@ -967,6 +1002,7 @@ mono_metadata_decode_row_col (const MonoTableInfo *t, int idx, guint col) } return 0; } + /** * mono_metadata_decode_blob_size: * @ptr: pointer to a blob object @@ -996,7 +1032,7 @@ mono_metadata_decode_blob_size (const char *xptr, const char **rptr) ptr += 4; } if (rptr) - *rptr = ptr; + *rptr = (char*)ptr; return size; } @@ -1031,7 +1067,7 @@ mono_metadata_decode_value (const char *_ptr, const char **rptr) ptr += 4; } if (rptr) - *rptr = ptr; + *rptr = (char*)ptr; return len; } @@ -1068,6 +1104,82 @@ mono_metadata_decode_signed_value (const char *ptr, const char **rptr) return ival - 0x20000000; } +/* + * Translates the given 1-based index into the Method, Field, Event, or Param tables + * using the *Ptr tables in uncompressed metadata, if they are available. + * + * FIXME: The caller is not forced to call this function, which is error-prone, since + * forgetting to call it would only show up as a bug on uncompressed metadata. + */ +guint32 +mono_metadata_translate_token_index (MonoImage *image, int table, guint32 idx) +{ + if (!image->uncompressed_metadata) + return idx; + + switch (table) { + case MONO_TABLE_METHOD: + if (image->tables [MONO_TABLE_METHOD_POINTER].rows) + return mono_metadata_decode_row_col (&image->tables [MONO_TABLE_METHOD_POINTER], idx - 1, MONO_METHOD_POINTER_METHOD); + else + return idx; + case MONO_TABLE_FIELD: + if (image->tables [MONO_TABLE_FIELD_POINTER].rows) + return mono_metadata_decode_row_col (&image->tables [MONO_TABLE_FIELD_POINTER], idx - 1, MONO_FIELD_POINTER_FIELD); + else + return idx; + case MONO_TABLE_EVENT: + if (image->tables [MONO_TABLE_EVENT_POINTER].rows) + return mono_metadata_decode_row_col (&image->tables [MONO_TABLE_EVENT_POINTER], idx - 1, MONO_EVENT_POINTER_EVENT); + else + return idx; + case MONO_TABLE_PROPERTY: + if (image->tables [MONO_TABLE_PROPERTY_POINTER].rows) + return mono_metadata_decode_row_col (&image->tables [MONO_TABLE_PROPERTY_POINTER], idx - 1, MONO_PROPERTY_POINTER_PROPERTY); + else + return idx; + case MONO_TABLE_PARAM: + if (image->tables [MONO_TABLE_PARAM_POINTER].rows) + return mono_metadata_decode_row_col (&image->tables [MONO_TABLE_PARAM_POINTER], idx - 1, MONO_PARAM_POINTER_PARAM); + else + return idx; + default: + return idx; + } +} + +/** + * mono_metadata_decode_table_row: + * + * Same as mono_metadata_decode_row, but takes an IMAGE+TABLE ID pair, and takes + * uncompressed metadata into account, so it should be used to access the + * Method, Field, Param and Event tables when the access is made from metadata, i.e. + * IDX is retrieved from a metadata table, like MONO_TYPEDEF_FIELD_LIST. + */ +void +mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *res, int res_size) +{ + if (image->uncompressed_metadata) + idx = mono_metadata_translate_token_index (image, table, idx + 1) - 1; + + mono_metadata_decode_row (&image->tables [table], idx, res, res_size); +} + +/** + * mono_metadata_decode_table_row_col: + * + * Same as mono_metadata_decode_row_col, but takes an IMAGE+TABLE ID pair, and takes + * uncompressed metadata into account, so it should be used to access the + * Method, Field, Param and Event tables. + */ +guint32 mono_metadata_decode_table_row_col (MonoImage *image, int table, int idx, guint col) +{ + if (image->uncompressed_metadata) + idx = mono_metadata_translate_token_index (image, table, idx + 1) - 1; + + return mono_metadata_decode_row_col (&image->tables [table], idx, col); +} + /* * mono_metadata_parse_typedef_or_ref: * @m: a metadata context. @@ -1229,6 +1341,13 @@ static GHashTable *generic_inst_cache = NULL; static GHashTable *generic_class_cache = NULL; static int next_generic_inst_id = 0; +/* + * Protected by the loader lock. + * It has a MonoMethodInflated* as key and value. + * The key lookup will just access the declaring and context fields + */ +static GHashTable *generic_method_cache = NULL; + static guint mono_generic_class_hash (gconstpointer data); /* @@ -1278,7 +1397,7 @@ mono_generic_inst_equal (gconstpointer ka, gconstpointer kb) const MonoGenericInst *b = (const MonoGenericInst *) kb; int i; - if ((a->is_open != b->is_open) || (a->type_argc != b->type_argc) || (a->is_reference != b->is_reference)) + if (a->is_open != b->is_open || a->type_argc != b->type_argc) return FALSE; for (i = 0; i < a->type_argc; ++i) { if (!do_mono_metadata_type_equal (a->type_argv [i], b->type_argv [i], FALSE)) @@ -1294,7 +1413,7 @@ mono_generic_class_hash (gconstpointer data) guint hash = mono_metadata_type_hash (&gclass->container_class->byval_arg); hash *= 13; - hash += mono_generic_inst_hash (gclass->inst); + hash += mono_metadata_generic_context_hash (&gclass->context); return hash; } @@ -1339,6 +1458,12 @@ mono_metadata_cleanup (void) g_hash_table_destroy (type_cache); g_hash_table_destroy (generic_inst_cache); g_hash_table_destroy (generic_class_cache); + if (generic_method_cache) + g_hash_table_destroy (generic_method_cache); + type_cache = NULL; + generic_inst_cache = NULL; + generic_class_cache = NULL; + generic_method_cache = NULL; } /** @@ -1362,7 +1487,7 @@ mono_metadata_cleanup (void) * this MonoGenericContainer. * This is a Mono runtime internal function. * - * LOCKING: Assumes the loader lock is held. + * LOCKING: Acquires the loader lock. * * Returns: a #MonoType structure representing the decoded type. */ @@ -1378,6 +1503,7 @@ mono_metadata_parse_type_full (MonoImage *m, MonoGenericContainer *container, Mo int count = 0; gboolean found; + mono_loader_lock (); /* * According to the spec, custom modifiers should come before the byref * flag, but the IL produced by ilasm from the following signature: @@ -1447,15 +1573,14 @@ mono_metadata_parse_type_full (MonoImage *m, MonoGenericContainer *container, Mo type->pinned = pinned ? 1 : 0; if (!do_mono_metadata_parse_type (type, m, container, ptr, &ptr)) { - if (type != &stype) - g_free (type); + mono_loader_unlock (); return NULL; } if (rptr) *rptr = ptr; - if (!type->num_mods) { + if (!type->num_mods) { /* no need to free type here, because it is on the stack */ if ((type->type == MONO_TYPE_CLASS || type->type == MONO_TYPE_VALUETYPE) && !type->pinned && !type->attrs) { MonoType *ret = type->byref ? &type->data.klass->this_arg : &type->data.klass->byval_arg; @@ -1478,12 +1603,16 @@ mono_metadata_parse_type_full (MonoImage *m, MonoGenericContainer *container, Mo LOCKING: even though we don't explicitly hold a lock, in the problematic case 'ret' is a field of a MonoClass which currently holds the loader lock. 'type' is local. */ - if (ret->data.klass == type->data.klass) + if (ret->data.klass == type->data.klass) { + mono_loader_unlock (); return ret; + } } /* No need to use locking since nobody is modifying the hash table */ - if ((cached = g_hash_table_lookup (type_cache, type))) + if ((cached = g_hash_table_lookup (type_cache, type))) { + mono_loader_unlock (); return cached; + } } /* printf ("%x %x %c %s\n", type->attrs, type->num_mods, type->pinned ? 'p' : ' ', mono_type_full_name (type)); */ @@ -1492,6 +1621,7 @@ mono_metadata_parse_type_full (MonoImage *m, MonoGenericContainer *container, Mo type = mono_mempool_alloc (m->mempool, sizeof (MonoType)); memcpy (type, &stype, sizeof (MonoType)); } + mono_loader_unlock (); return type; } @@ -1518,16 +1648,16 @@ mono_metadata_get_param_attrs (MonoImage *m, int def) MonoTableInfo *paramt = &m->tables [MONO_TABLE_PARAM]; MonoTableInfo *methodt = &m->tables [MONO_TABLE_METHOD]; guint32 cols [MONO_PARAM_SIZE]; - guint lastp, i, param_index = mono_metadata_decode_row_col (methodt, def - 1, MONO_METHOD_PARAMLIST); + guint lastp, i, param_index = mono_metadata_decode_row_col (&m->tables [MONO_TABLE_METHOD], def - 1, MONO_METHOD_PARAMLIST); int *pattrs = NULL; if (def < methodt->rows) - lastp = mono_metadata_decode_row_col (methodt, def, MONO_METHOD_PARAMLIST); + lastp = mono_metadata_decode_row_col (&m->tables [MONO_TABLE_METHOD], def, MONO_METHOD_PARAMLIST); else lastp = paramt->rows + 1; for (i = param_index; i < lastp; ++i) { - mono_metadata_decode_row (paramt, i - 1, cols, MONO_PARAM_SIZE); + mono_metadata_decode_row (&m->tables [MONO_TABLE_PARAM], i - 1, cols, MONO_PARAM_SIZE); if (cols [MONO_PARAM_FLAGS]) { if (!pattrs) pattrs = g_new0 (int, 1 + (lastp - param_index)); @@ -1604,9 +1734,11 @@ mono_metadata_signature_alloc (MonoImage *m, guint32 nparams) { MonoMethodSignature *sig; + mono_loader_lock (); sig = mono_mempool_alloc0 (m->mempool, sizeof (MonoMethodSignature) + ((gint32)nparams - MONO_ZERO_LEN_ARRAY) * sizeof (MonoType*)); sig->param_count = nparams; sig->sentinelpos = -1; + mono_loader_unlock (); return sig; } @@ -1763,61 +1895,222 @@ mono_metadata_free_method_signature (MonoMethodSignature *sig) } } +static gboolean +inflated_method_equal (gconstpointer a, gconstpointer b) +{ + const MonoMethodInflated *ma = a; + const MonoMethodInflated *mb = b; + if (ma->declaring != mb->declaring) + return FALSE; + return mono_metadata_generic_context_equal (&ma->context, &mb->context); +} + +static guint +inflated_method_hash (gconstpointer a) +{ + const MonoMethodInflated *ma = a; + return mono_metadata_generic_context_hash (&ma->context) ^ mono_aligned_addr_hash (ma->declaring); +} + +/*static void +dump_ginst (MonoGenericInst *ginst) +{ + int i; + char *name; + + g_print ("Ginst: <"); + for (i = 0; i < ginst->type_argc; ++i) { + if (i != 0) + g_print (", "); + name = mono_type_get_name (ginst->type_argv [i]); + g_print ("%s", name); + g_free (name); + } + g_print (">"); +}*/ + +static gboolean gclass_in_image (gpointer key, gpointer value, gpointer data); + +static gboolean +ginst_in_image (gpointer key, gpointer value, gpointer data) +{ + MonoImage *image = data; + MonoGenericInst *ginst = key; + MonoClass *klass; + int i; + for (i = 0; i < ginst->type_argc; ++i) { + MonoType *type = ginst->type_argv [i]; + + /* FIXME: Avoid a possible mono_class_inst inside mono_class_from_mono_type */ + if (type->type == MONO_TYPE_GENERICINST) { + if (gclass_in_image (type->data.generic_class, NULL, image)) + return TRUE; + continue; + } + + klass = mono_class_from_mono_type (ginst->type_argv [i]); + if (klass->image == image) { + /*dump_ginst (ginst); + g_print (" removed\n");*/ + return TRUE; + } + } + return FALSE; +} + +static gboolean +gclass_in_image (gpointer key, gpointer value, gpointer data) +{ + MonoImage *image = data; + MonoGenericClass *gclass = key; + + if (ginst_in_image (gclass->context.class_inst, NULL, image)) + return TRUE; + if (gclass->container_class->image == image) + return TRUE; + return FALSE; +} + +static gboolean +inflated_method_in_image (gpointer key, gpointer value, gpointer data) +{ + MonoImage *image = data; + MonoMethodInflated *method = key; + + if (method->declaring->klass->image == image) + return TRUE; + if (method->context.class_inst && ginst_in_image (method->context.class_inst, NULL, image)) + return TRUE; + if (method->context.method_inst && ginst_in_image (method->context.method_inst, NULL, image)) + return TRUE; + return FALSE; +} + /* - * mono_metadata_lookup_generic_inst: - * - * Check whether the newly created generic instantiation @ginst already exists - * in the cache and return the cached value in this case. Otherwise insert - * it into the cache. + * LOCKING: assumes the loader lock is held. + */ +MonoMethodInflated* +mono_method_inflated_lookup (MonoMethodInflated* method, gboolean cache) +{ + if (cache) { + if (!generic_method_cache) + generic_method_cache = g_hash_table_new (inflated_method_hash, inflated_method_equal); + g_hash_table_insert (generic_method_cache, method, method); + return method; + } else { + if (generic_method_cache) + return g_hash_table_lookup (generic_method_cache, method); + return NULL; + } +} + +void +mono_metadata_clean_for_image (MonoImage *image) +{ + mono_loader_lock (); + g_hash_table_foreach_remove (generic_inst_cache, ginst_in_image, image); + g_hash_table_foreach_remove (generic_class_cache, gclass_in_image, image); + if (generic_method_cache) + g_hash_table_foreach_remove (generic_method_cache, inflated_method_in_image, image); + mono_loader_unlock (); +} + +/* + * mono_metadata_get_generic_inst: * - * Use this method each time you create a new `MonoGenericInst' to ensure - * proper caching. Only use the returned value as the argument passed to this - * method may be freed. + * Given a list of types, return a MonoGenericInst that represents that list. + * The returned MonoGenericInst has its own copy of the list of types. The list + * passed in the argument can be freed, modified or disposed of. * */ MonoGenericInst * -mono_metadata_lookup_generic_inst (MonoGenericInst *ginst) +mono_metadata_get_generic_inst (int type_argc, MonoType **type_argv) { - MonoGenericInst *cached; + MonoGenericInst *ginst; + MonoGenericInst helper; int i; - cached = g_hash_table_lookup (generic_inst_cache, ginst); - if (cached) { - for (i = 0; i < ginst->type_argc; i++) - mono_metadata_free_type (ginst->type_argv [i]); - g_free (ginst->type_argv); - g_free (ginst); - return cached; + helper.type_argc = type_argc; + helper.type_argv = type_argv; + helper.id = 0; + + for (i = 0; i < type_argc; ++i) + if (mono_class_is_open_constructed_type (type_argv [i])) + break; + helper.is_open = (i < type_argc); + + /*dump_ginst (&helper);*/ + mono_loader_lock (); + ginst = g_hash_table_lookup (generic_inst_cache, &helper); + if (ginst) { + mono_loader_unlock (); + /*g_print (" found cached\n");*/ + return ginst; } + ginst = g_new0 (MonoGenericInst, 1); + ginst->type_argc = type_argc; + ginst->type_argv = g_new (MonoType*, type_argc); ginst->id = ++next_generic_inst_id; + ginst->is_open = helper.is_open; + + for (i = 0; i < type_argc; ++i) + ginst->type_argv [i] = mono_metadata_type_dup (NULL, type_argv [i]); + g_hash_table_insert (generic_inst_cache, ginst, ginst); + mono_loader_unlock (); + /*g_print (" inserted\n");*/ return ginst; } /* * mono_metadata_lookup_generic_class: * - * Check whether the newly created generic class @gclass already exists - * in the cache and return the cached value in this case. Otherwise insert - * it into the cache and return NULL. - * - * Returns: the previosly cached generic class or NULL if it has been newly - * inserted into the cache. + * Returns a MonoGenericClass with the given properties. * */ MonoGenericClass * -mono_metadata_lookup_generic_class (MonoGenericClass *gclass) +mono_metadata_lookup_generic_class (MonoClass *container_class, MonoGenericInst *inst, gboolean is_dynamic) { - MonoGenericClass *cached; + MonoGenericClass *gclass; + + MonoGenericClass helper; + helper.container_class = container_class; + helper.context.class_inst = inst; + helper.context.method_inst = NULL; + helper.is_dynamic = is_dynamic; /* We use this in a hash lookup, which does not attempt to downcast the pointer */ + helper.cached_class = NULL; - cached = g_hash_table_lookup (generic_class_cache, gclass); - if (cached) - return cached; + mono_loader_lock (); + + gclass = g_hash_table_lookup (generic_class_cache, &helper); + + /* A tripwire just to keep us honest */ + g_assert (!helper.cached_class); + + if (gclass) { + mono_loader_unlock (); + return gclass; + } + + if (is_dynamic) { + MonoDynamicGenericClass *dgclass = g_new0 (MonoDynamicGenericClass, 1); + gclass = &dgclass->generic_class; + gclass->is_dynamic = 1; + } else { + gclass = g_new0 (MonoGenericClass, 1); + } + + gclass->container_class = container_class; + gclass->context.class_inst = inst; + gclass->context.method_inst = NULL; g_hash_table_insert (generic_class_cache, gclass, gclass); - return NULL; + + mono_loader_unlock (); + + return gclass; } /* @@ -1829,138 +2122,80 @@ mono_metadata_lookup_generic_class (MonoGenericClass *gclass) MonoGenericInst * mono_metadata_inflate_generic_inst (MonoGenericInst *ginst, MonoGenericContext *context) { + MonoType **type_argv; MonoGenericInst *nginst; int i; if (!ginst->is_open) return ginst; - nginst = g_new0 (MonoGenericInst, 1); - nginst->type_argc = ginst->type_argc; - nginst->type_argv = g_new0 (MonoType*, nginst->type_argc); - nginst->is_reference = 1; + type_argv = g_new0 (MonoType*, ginst->type_argc); - for (i = 0; i < nginst->type_argc; i++) { - MonoType *t = mono_class_inflate_generic_type (ginst->type_argv [i], context); + for (i = 0; i < ginst->type_argc; i++) + type_argv [i] = mono_class_inflate_generic_type (ginst->type_argv [i], context); - if (!nginst->is_open) - nginst->is_open = mono_class_is_open_constructed_type (t); - if (nginst->is_reference) - nginst->is_reference = MONO_TYPE_IS_REFERENCE (t); + nginst = mono_metadata_get_generic_inst (ginst->type_argc, type_argv); - nginst->type_argv [i] = t; - } + g_free (type_argv); - return mono_metadata_lookup_generic_inst (nginst); + return nginst; } MonoGenericInst * mono_metadata_parse_generic_inst (MonoImage *m, MonoGenericContainer *container, int count, const char *ptr, const char **rptr) { + MonoType **type_argv; MonoGenericInst *ginst; int i; - ginst = g_new0 (MonoGenericInst, 1); - ginst->type_argc = count; - ginst->type_argv = g_new0 (MonoType*, count); - ginst->is_reference = 1; + type_argv = g_new0 (MonoType*, count); - for (i = 0; i < ginst->type_argc; i++) { + for (i = 0; i < count; i++) { MonoType *t = mono_metadata_parse_type_full (m, container, MONO_PARSE_TYPE, 0, ptr, &ptr); - if (!t) { - g_free (ginst->type_argv); - g_free (ginst); + g_free (type_argv); return NULL; } - ginst->type_argv [i] = t; - if (!ginst->is_open) - ginst->is_open = mono_class_is_open_constructed_type (t); - if (ginst->is_reference) - ginst->is_reference = MONO_TYPE_IS_REFERENCE (t); + type_argv [i] = t; } if (rptr) *rptr = ptr; - return mono_metadata_lookup_generic_inst (ginst); + ginst = mono_metadata_get_generic_inst (count, type_argv); + + g_free (type_argv); + + return ginst; } static gboolean do_mono_metadata_parse_generic_class (MonoType *type, MonoImage *m, MonoGenericContainer *container, const char *ptr, const char **rptr) { - MonoInflatedGenericClass *igclass; - MonoGenericClass *gclass, *cached; + MonoGenericInst *inst; MonoClass *gklass; MonoType *gtype; int count; - igclass = g_new0 (MonoInflatedGenericClass, 1); - gclass = &igclass->generic_class; - gclass->is_inflated = TRUE; - - type->data.generic_class = gclass; - - gclass->context = g_new0 (MonoGenericContext, 1); - gclass->context->gclass = gclass; - - /* - * Create the klass before parsing the type arguments. - * This is required to support "recursive" definitions. - * See mcs/tests/gen-23.cs for an example. - */ - igclass->klass = g_new0 (MonoClass, 1); - gtype = mono_metadata_parse_type (m, MONO_PARSE_TYPE, 0, ptr, &ptr); if (gtype == NULL) return FALSE; - gclass->container_class = gklass = mono_class_from_mono_type (gtype); - g_assert (gklass->generic_container); - gclass->context->container = gklass->generic_container; + gklass = mono_class_from_mono_type (gtype); + if (!gklass->generic_container) + return FALSE; count = mono_metadata_decode_value (ptr, &ptr); - - gclass->inst = mono_metadata_parse_generic_inst (m, container, count, ptr, &ptr); + inst = mono_metadata_parse_generic_inst (m, container, count, ptr, &ptr); + if (inst == NULL) + return FALSE; if (rptr) *rptr = ptr; - /* If we failed to parse, return, the error has been flagged. */ - if (gclass->inst == NULL) - return FALSE; - - /* - * We may be called multiple times on different metadata to create the same - * instantiated type. This happens for instance if we're part of a method or - * local variable signature. - * - * It's important to return the same MonoGenericClass * for each particualar - * instantiation of a generic type (ie "Stack") to make static fields - * work. - * - * According to the spec ($26.1.5), a static variable in a generic class - * declaration is shared amongst all instances of the same closed constructed - * type. - */ - - cached = g_hash_table_lookup (generic_class_cache, gclass); - if (cached) { - g_free (igclass->klass); - g_free (gclass); - - type->data.generic_class = cached; - return TRUE; - } else { - g_hash_table_insert (generic_class_cache, gclass, gclass); - - mono_stats.generic_instance_count++; - mono_stats.generics_metadata_size += sizeof (MonoGenericClass) + - sizeof (MonoGenericContext) + - gclass->inst->type_argc * sizeof (MonoType); - } + type->data.generic_class = mono_metadata_lookup_generic_class (gklass, inst, FALSE); return TRUE; } @@ -2185,7 +2420,6 @@ parse_section_data (MonoImage *m, MonoMethodHeader *mh, const unsigned char *ptr while (1) { /* align on 32-bit boundary */ - /* FIXME: not 64-bit clean code */ sptr = ptr = dword_align (ptr); sect_data_flags = *ptr; ptr++; @@ -2277,6 +2511,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons g_return_val_if_fail (ptr != NULL, NULL); + mono_loader_lock (); switch (format) { case METHOD_HEADER_TINY_FORMAT: mh = mono_mempool_alloc0 (m->mempool, sizeof (MonoMethodHeader)); @@ -2284,7 +2519,8 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons mh->max_stack = 8; local_var_sig_tok = 0; mh->code_size = flags >> 2; - mh->code = ptr; + mh->code = (unsigned char*)ptr; + mono_loader_unlock (); return mh; case METHOD_HEADER_TINY_FORMAT1: mh = mono_mempool_alloc0 (m->mempool, sizeof (MonoMethodHeader)); @@ -2297,7 +2533,8 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons * incorrect */ mh->code_size = flags >> 2; - mh->code = ptr; + mh->code = (unsigned char*)ptr; + mono_loader_unlock (); return mh; case METHOD_HEADER_FAT_FORMAT: fat_flags = read16 (ptr); @@ -2315,7 +2552,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons else init_locals = 0; - code = ptr; + code = (unsigned char*)ptr; if (!(fat_flags & METHOD_HEADER_MORE_SECTS)) break; @@ -2323,9 +2560,10 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons /* * There are more sections */ - ptr = code + code_size; + ptr = (char*)code + code_size; break; default: + mono_loader_unlock (); return NULL; } @@ -2348,6 +2586,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons mh->locals [i] = mono_metadata_parse_type_full ( m, container, MONO_PARSE_LOCAL, 0, locals_ptr, &locals_ptr); if (!mh->locals [i]) { + mono_loader_unlock (); return NULL; } } @@ -2360,6 +2599,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons mh->init_locals = init_locals; if (fat_flags & METHOD_HEADER_MORE_SECTS) parse_section_data (m, mh, (const unsigned char*)ptr); + mono_loader_unlock (); return mh; } @@ -2674,6 +2914,30 @@ declsec_locator (const void *a, const void *b) return 1; } +/** + * search_ptr_table: + * + * Return the 1-based row index in TABLE, which must be one of the *Ptr tables, + * which contains IDX. + */ +static guint32 +search_ptr_table (MonoImage *image, int table, int idx) +{ + MonoTableInfo *ptrdef = &image->tables [table]; + int i; + + /* Use a linear search to find our index in the table */ + for (i = 0; i < ptrdef->rows; i ++) + /* All the Ptr tables have the same structure */ + if (mono_metadata_decode_row_col (ptrdef, i, 0) == idx) + break; + + if (i < ptrdef->rows) + return i + 1; + else + return idx; +} + /** * mono_metadata_typedef_from_field: * @meta: metadata context @@ -2695,6 +2959,9 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index) loc.col_idx = MONO_TYPEDEF_FIELD_LIST; loc.t = tdef; + if (meta->uncompressed_metadata) + loc.idx = search_ptr_table (meta, MONO_TABLE_FIELD_POINTER, loc.idx); + if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, typedef_locator)) g_assert_not_reached (); @@ -2723,6 +2990,9 @@ mono_metadata_typedef_from_method (MonoImage *meta, guint32 index) loc.col_idx = MONO_TYPEDEF_METHOD_LIST; loc.t = tdef; + if (meta->uncompressed_metadata) + loc.idx = search_ptr_table (meta, MONO_TABLE_METHOD_POINTER, loc.idx); + if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, typedef_locator)) g_assert_not_reached (); @@ -2782,7 +3052,9 @@ mono_metadata_interfaces_from_typedef_full (MonoImage *meta, guint32 index, Mono ++pos; } + mono_loader_lock (); result = mono_mempool_alloc0 (meta->mempool, sizeof (MonoClass*) * (pos - start)); + mono_loader_unlock (); pos = start; while (pos < tdef->rows) { @@ -2939,6 +3211,8 @@ mono_metadata_custom_attrs_from_index (MonoImage *meta, guint32 index) loc.col_idx = MONO_CUSTOM_ATTR_PARENT; loc.t = tdef; + /* FIXME: Index translation */ + if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator)) return 0; @@ -3009,10 +3283,9 @@ mono_backtrace (int limit) * * Returns: the number of bytes required to hold an instance of this * type in memory - * FIXME: This should really use 'guint32*' for the align parameter. */ int -mono_type_size (MonoType *t, gint *align) +mono_type_size (MonoType *t, int *align) { if (!t) { *align = 1; @@ -3067,7 +3340,7 @@ mono_type_size (MonoType *t, gint *align) if (t->data.klass->enumtype) return mono_type_size (t->data.klass->enum_basetype, align); else - return mono_class_value_size (t->data.klass, align); + return mono_class_value_size (t->data.klass, (guint32*)align); } case MONO_TYPE_CLASS: case MONO_TYPE_SZARRAY: @@ -3077,22 +3350,18 @@ mono_type_size (MonoType *t, gint *align) *align = __alignof__(gpointer); return sizeof (gpointer); case MONO_TYPE_TYPEDBYREF: - return mono_class_value_size (mono_defaults.typed_reference_class, align); + return mono_class_value_size (mono_defaults.typed_reference_class, (guint32*)align); case MONO_TYPE_GENERICINST: { - MonoInflatedGenericClass *gclass; - MonoClass *container_class; + MonoGenericClass *gclass = t->data.generic_class; + MonoClass *container_class = gclass->container_class; - gclass = mono_get_inflated_generic_class (t->data.generic_class); - // g_assert (!gclass->generic_class.inst->is_open); - // g_assert (!gclass->klass->generic_container); - - container_class = gclass->generic_class.container_class; + // g_assert (!gclass->inst->is_open); if (container_class->valuetype) { if (container_class->enumtype) return mono_type_size (container_class->enum_basetype, align); else - return mono_class_value_size (gclass->klass, align); + return mono_class_value_size (mono_class_from_mono_type (t), (guint32*)align); } else { *align = __alignof__(gpointer); return sizeof (gpointer); @@ -3115,10 +3384,9 @@ mono_type_size (MonoType *t, gint *align) * * Returns: the number of bytes required to hold an instance of this * type on the runtime stack - * FIXME: This should really use 'guint32*' for the align parameter. */ int -mono_type_stack_size (MonoType *t, gint *align) +mono_type_stack_size (MonoType *t, int *align) { int tmp; @@ -3171,7 +3439,7 @@ mono_type_stack_size (MonoType *t, gint *align) if (t->data.klass->enumtype) return mono_type_stack_size (t->data.klass->enum_basetype, align); else { - size = mono_class_value_size (t->data.klass, align); + size = mono_class_value_size (t->data.klass, (guint32*)align); *align = *align + __alignof__(gpointer) - 1; *align &= ~(__alignof__(gpointer) - 1); @@ -3183,20 +3451,16 @@ mono_type_stack_size (MonoType *t, gint *align) } } case MONO_TYPE_GENERICINST: { - MonoInflatedGenericClass *gclass; - MonoClass *container_class; - - gclass = mono_get_inflated_generic_class (t->data.generic_class); - container_class = gclass->generic_class.container_class; + MonoGenericClass *gclass = t->data.generic_class; + MonoClass *container_class = gclass->container_class; - g_assert (!gclass->generic_class.inst->is_open); - g_assert (!gclass->klass->generic_container); + g_assert (!gclass->context.class_inst->is_open); if (container_class->valuetype) { if (container_class->enumtype) return mono_type_stack_size (container_class->enum_basetype, align); else { - guint32 size = mono_class_value_size (gclass->klass, align); + guint32 size = mono_class_value_size (mono_class_from_mono_type (t), (guint32*)align); *align = *align + __alignof__(gpointer) - 1; *align &= ~(__alignof__(gpointer) - 1); @@ -3234,33 +3498,38 @@ static gboolean _mono_metadata_generic_class_equal (const MonoGenericClass *g1, const MonoGenericClass *g2, gboolean signature_only) { int i; + MonoGenericInst *i1 = g1->context.class_inst; + MonoGenericInst *i2 = g2->context.class_inst; - if ((g1->inst->type_argc != g2->inst->type_argc) || (g1->is_dynamic != g2->is_dynamic) || - (g1->inst->is_reference != g2->inst->is_reference)) + if (i1->type_argc != i2->type_argc || g1->is_dynamic != g2->is_dynamic) return FALSE; if (!mono_metadata_class_equal (g1->container_class, g2->container_class, signature_only)) return FALSE; - for (i = 0; i < g1->inst->type_argc; ++i) { - if (!do_mono_metadata_type_equal (g1->inst->type_argv [i], g2->inst->type_argv [i], signature_only)) + for (i = 0; i < i1->type_argc; ++i) { + if (!do_mono_metadata_type_equal (i1->type_argv [i], i2->type_argv [i], signature_only)) return FALSE; } return TRUE; } guint -mono_metadata_generic_method_hash (MonoGenericMethod *gmethod) +mono_metadata_generic_context_hash (const MonoGenericContext *context) { - return gmethod->inst->id; + /* FIXME: check if this seed is good enough */ + guint hash = 0xc01dfee7; + if (context->class_inst) + hash = ((hash << 5) - hash) ^ context->class_inst->id; + if (context->method_inst) + hash = ((hash << 5) - hash) ^ context->method_inst->id; + return hash; } gboolean -mono_metadata_generic_method_equal (MonoGenericMethod *g1, MonoGenericMethod *g2) +mono_metadata_generic_context_equal (const MonoGenericContext *g1, const MonoGenericContext *g2) { - return (g1->container == g2->container) && (g1->generic_class == g2->generic_class) && - (g1->inst == g2->inst); + return g1->class_inst == g2->class_inst && g1->method_inst == g2->method_inst; } - /* * mono_metadata_type_hash: * @t1: a type @@ -3470,27 +3739,37 @@ mono_metadata_signature_equal (MonoMethodSignature *sig1, MonoMethodSignature *s } /** - * mono_metadata_type_dup_mp: - * @image: image type is defined in + * mono_metadata_type_dup: + * @mp: mempool to use * @original: type to duplicate * - * Returns: copy of type allocated from mempool. + * Returns: copy of type allocated from mempool (or from the heap, if @mp is null). */ MonoType * -mono_metadata_type_dup_mp (MonoImage *image, const MonoType *original) +mono_metadata_type_dup (MonoMemPool *mp, const MonoType *o) { MonoType *r = NULL; + int sizeof_o = sizeof (MonoType); + if (o->num_mods) + sizeof_o += (o->num_mods - MONO_ZERO_LEN_ARRAY) * sizeof (MonoCustomMod); + mono_loader_lock (); - r = mono_mempool_alloc0 (image->mempool, sizeof(MonoType)); + r = mp ? mono_mempool_alloc0 (mp, sizeof_o) : g_malloc (sizeof_o); mono_loader_unlock (); - *r = *original; - /* FIXME: we don't handle these yet because they need to duplicate memory - * but the current routines used are not using the mempools - */ - if (original->type == MONO_TYPE_PTR || - original->type == MONO_TYPE_ARRAY || - original->type == MONO_TYPE_FNPTR) - g_assert_not_reached (); + + memcpy (r, o, sizeof_o); + + if (o->type == MONO_TYPE_PTR) { + r->data.type = mono_metadata_type_dup (mp, o->data.type); + } else if (o->type == MONO_TYPE_ARRAY) { + /* FIXME: should mono_dup_array_type() use mempools? */ + g_assert (!mp); + r->data.array = mono_dup_array_type (o->data.array); + } else if (o->type == MONO_TYPE_FNPTR) { + /* FIXME: should mono_metadata_signature_deep_dup() use mempools? */ + g_assert (!mp); + r->data.method = mono_metadata_signature_deep_dup (o->data.method); + } return r; } @@ -3561,6 +3840,9 @@ mono_metadata_field_info (MonoImage *meta, guint32 index, guint32 *offset, guint locator_t loc; loc.idx = index + 1; + if (meta->uncompressed_metadata) + loc.idx = search_ptr_table (meta, MONO_TABLE_FIELD_POINTER, loc.idx); + if (offset) { tdef = &meta->tables [MONO_TABLE_FIELDLAYOUT]; @@ -3635,6 +3917,8 @@ mono_metadata_get_constant_index (MonoImage *meta, guint32 token, guint32 hint) loc.col_idx = MONO_CONSTANT_PARENT; loc.t = tdef; + /* FIXME: Index translation */ + if ((hint > 0) && (hint < tdef->rows) && (mono_metadata_decode_row_col (tdef, hint - 1, MONO_CONSTANT_PARENT) == index)) return hint; @@ -3704,6 +3988,9 @@ mono_metadata_methods_from_event (MonoImage *meta, guint32 index, guint *end_i if (!msemt->base) return 0; + if (meta->uncompressed_metadata) + index = search_ptr_table (meta, MONO_TABLE_EVENT_POINTER, index + 1) - 1; + loc.t = msemt; loc.col_idx = MONO_METHOD_SEMA_ASSOCIATION; loc.idx = ((index + 1) << MONO_HAS_SEMANTICS_BITS) | MONO_HAS_SEMANTICS_EVENT; /* Method association coded index */ @@ -3792,6 +4079,9 @@ mono_metadata_methods_from_property (MonoImage *meta, guint32 index, guint *en if (!msemt->base) return 0; + if (meta->uncompressed_metadata) + index = search_ptr_table (meta, MONO_TABLE_PROPERTY_POINTER, index + 1) - 1; + loc.t = msemt; loc.col_idx = MONO_METHOD_SEMA_ASSOCIATION; loc.idx = ((index + 1) << MONO_HAS_SEMANTICS_BITS) | MONO_HAS_SEMANTICS_PROPERTY; /* Method association coded index */ @@ -3829,6 +4119,8 @@ mono_metadata_implmap_from_method (MonoImage *meta, guint32 method_idx) if (!tdef->base) return 0; + /* No index translation seems to be needed */ + loc.t = tdef; loc.col_idx = MONO_IMPLMAP_MEMBER; loc.idx = ((method_idx + 1) << MONO_MEMBERFORWD_BITS) | MONO_MEMBERFORWD_METHODDEF; @@ -3854,7 +4146,7 @@ mono_type_create_from_typespec (MonoImage *image, guint32 type_spec) guint32 cols [MONO_TYPESPEC_SIZE]; const char *ptr; guint32 len; - MonoType *type; + MonoType *type, *type2; mono_loader_lock (); @@ -3872,20 +4164,27 @@ mono_type_create_from_typespec (MonoImage *image, guint32 type_spec) type = g_new0 (MonoType, 1); - g_hash_table_insert (image->typespec_cache, GUINT_TO_POINTER (type_spec), type); - if (*ptr == MONO_TYPE_BYREF) { type->byref = 1; ptr++; } if (!do_mono_metadata_parse_type (type, image, NULL, ptr, &ptr)) { - g_hash_table_remove (image->typespec_cache, GUINT_TO_POINTER (type_spec)); g_free (type); mono_loader_unlock (); return NULL; } + type2 = g_hash_table_lookup (image->typespec_cache, GUINT_TO_POINTER (type_spec)); + + if (type2) { + g_free (type); + mono_loader_unlock (); + return type2; + } + + g_hash_table_insert (image->typespec_cache, GUINT_TO_POINTER (type_spec), type); + mono_loader_unlock (); return type; @@ -3976,7 +4275,17 @@ mono_metadata_free_marshal_spec (MonoMarshalSpec *spec) } g_free (spec); } - + +/** + * mono_type_to_unmanaged: + * + * Returns: A MonoMarshalNative enumeration value (MONO_NATIVE_) value + * describing the underlying native reprensetation of the type. + * + * In addition the value pointed by + * "conv" will contain the kind of marshalling required for this + * particular type one of the MONO_MARSHAL_CONV_ enumeration values. + */ guint32 mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec, gboolean as_field, gboolean unicode, MonoMarshalConv *conv) @@ -4054,14 +4363,24 @@ handle_enum: g_error ("Can not marshal string to native type '%02x': Invalid managed/unmanaged type combination (String fields must be paired with LPStr, LPWStr, BStr or ByValTStr).", mspec->native); } } - *conv = MONO_MARSHAL_CONV_STR_LPTSTR; - return MONO_NATIVE_LPTSTR; + if (unicode) { + *conv = MONO_MARSHAL_CONV_STR_LPWSTR; + return MONO_NATIVE_LPWSTR; + } + else { + *conv = MONO_MARSHAL_CONV_STR_LPSTR; + return MONO_NATIVE_LPSTR; + } case MONO_TYPE_PTR: return MONO_NATIVE_UINT; case MONO_TYPE_VALUETYPE: /*FIXME*/ if (type->data.klass->enumtype) { t = type->data.klass->enum_basetype->type; goto handle_enum; } + if (type->data.klass == mono_defaults.handleref_class){ + *conv = MONO_MARSHAL_CONV_HANDLEREF; + return MONO_NATIVE_INT; + } return MONO_NATIVE_STRUCT; case MONO_TYPE_SZARRAY: case MONO_TYPE_ARRAY: @@ -4095,6 +4414,8 @@ handle_enum: switch (mspec->native) { case MONO_NATIVE_STRUCT: return MONO_NATIVE_STRUCT; + case MONO_NATIVE_CUSTOM: + return MONO_NATIVE_CUSTOM; case MONO_NATIVE_INTERFACE: *conv = MONO_MARSHAL_CONV_OBJECT_INTERFACE; return MONO_NATIVE_INTERFACE; @@ -4122,6 +4443,10 @@ handle_enum: *conv = MONO_MARSHAL_CONV_DEL_FTN; return MONO_NATIVE_FUNC; } + if (mono_defaults.safehandle_class && type->data.klass == mono_defaults.safehandle_class){ + *conv = MONO_MARSHAL_CONV_SAFEHANDLE; + return MONO_NATIVE_INT; + } *conv = MONO_MARSHAL_CONV_OBJECT_STRUCT; return MONO_NATIVE_STRUCT; } @@ -4150,6 +4475,8 @@ mono_metadata_get_marshal_info (MonoImage *meta, guint32 idx, gboolean is_field) loc.col_idx = MONO_FIELD_MARSHAL_PARENT; loc.idx = ((idx + 1) << MONO_HAS_FIELD_MARSHAL_BITS) | (is_field? MONO_HAS_FIELD_MARSHAL_FIELDSREF: MONO_HAS_FIELD_MARSHAL_PARAMDEF); + /* FIXME: Index translation */ + if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator)) return NULL; @@ -4160,6 +4487,7 @@ static MonoMethod* method_from_method_def_or_ref (MonoImage *m, guint32 tok, MonoGenericContext *context) { guint32 idx = tok >> MONO_METHODDEFORREF_BITS; + switch (tok & MONO_METHODDEFORREF_MASK) { case MONO_METHODDEFORREF_METHODDEF: return mono_get_method_full (m, MONO_TOKEN_METHOD_DEF | idx, NULL, context); @@ -4271,9 +4599,6 @@ get_constraints (MonoImage *image, int owner, MonoClass ***constraints, MonoGene GList *cons = NULL, *tmp; MonoGenericContext *context = &container->context; - /* FIXME: !container->klass => this is probably monodis */ - g_assert (!container->klass || context->gclass || context->gmethod); - *constraints = NULL; found = 0; for (i = 0; i < tdef->rows; ++i) { @@ -4388,6 +4713,7 @@ mono_metadata_load_generic_params (MonoImage *image, guint32 token, MonoGenericC guint32 i, owner = 0, n; MonoGenericContainer *container; MonoGenericParam *params; + MonoGenericContext *context; if (!(i = mono_metadata_get_generic_param_row (image, token, &owner))) return NULL; @@ -4400,7 +4726,6 @@ mono_metadata_load_generic_params (MonoImage *image, guint32 token, MonoGenericC params = g_realloc (params, sizeof (MonoGenericParam) * n); params [n - 1].owner = container; params [n - 1].pklass = NULL; - params [n - 1].method = NULL; params [n - 1].flags = cols [MONO_GENERICPARAM_FLAGS]; params [n - 1].num = cols [MONO_GENERICPARAM_NUMBER]; params [n - 1].name = mono_metadata_string_heap (image, cols [MONO_GENERICPARAM_NAME]); @@ -4417,11 +4742,47 @@ mono_metadata_load_generic_params (MonoImage *image, guint32 token, MonoGenericC if (mono_metadata_token_table (token) == MONO_TABLE_METHOD) container->is_method = 1; - container->context.container = container; + g_assert (container->parent == NULL || container->is_method); + + context = &container->context; + if (container->is_method) { + context->class_inst = container->parent ? container->parent->context.class_inst : NULL; + context->method_inst = mono_get_shared_generic_inst (container); + } else { + context->class_inst = mono_get_shared_generic_inst (container); + } return container; } +MonoGenericInst * +mono_get_shared_generic_inst (MonoGenericContainer *container) +{ + MonoType **type_argv; + MonoType *helper; + MonoGenericInst *nginst; + int i; + + type_argv = g_new0 (MonoType *, container->type_argc); + helper = g_new0 (MonoType, container->type_argc); + + for (i = 0; i < container->type_argc; i++) { + MonoType *t = &helper [i]; + + t->type = container->is_method ? MONO_TYPE_MVAR : MONO_TYPE_VAR; + t->data.generic_param = &container->type_params [i]; + + type_argv [i] = t; + } + + nginst = mono_metadata_get_generic_inst (container->type_argc, type_argv); + + g_free (type_argv); + g_free (helper); + + return nginst; +} + gboolean mono_type_is_byref (MonoType *type) {