#include <mono/metadata/reflection.h>
#include <mono/utils/mono-logger.h>
-static void mono_loader_wine_init (void);
-
MonoDefaults mono_defaults;
/*
}
mono_loader_lock ();
- if (!field->parent->generic_inst)
+ if (!field->parent->generic_class)
g_hash_table_insert (image->field_cache, GUINT_TO_POINTER (token), field);
mono_loader_unlock ();
return field;
find_method (MonoClass *klass, MonoClass *ic, const char* name, MonoMethodSignature *sig)
{
int i;
- MonoClass *sclass = klass;
char *qname, *fqname;
if (ic) {
continue;
if (sig->call_convention == MONO_CALL_VARARG) {
- if (mono_metadata_signature_vararg_match (sig, m->signature))
+ if (mono_metadata_signature_vararg_match (sig, mono_method_signature (m)))
return m;
} else {
- if (mono_metadata_signature_equal (sig, m->signature))
+ if (mono_metadata_signature_equal (sig, mono_method_signature (m)))
return m;
}
}
klass = klass->parent;
}
- if (sclass->generic_inst) {
- MonoClass *gclass;
- MonoMethod *res;
-
- gclass = mono_class_from_mono_type (sclass->generic_inst->generic_type);
- mono_class_init (gclass);
-
- res = find_method (gclass, ic, name, sig);
- if (!res)
- return NULL;
- for (i = 0; i < res->klass->method.count; ++i) {
- if (res == res->klass->methods [i]) {
- return sclass->methods [i];
- }
- }
- }
-
return NULL;
}
* token is the method_ref or method_def token used in a call IL instruction.
*/
MonoMethodSignature*
-mono_method_get_signature (MonoMethod *method, MonoImage *image, guint32 token)
+mono_method_get_signature_full (MonoMethod *method, MonoImage *image, guint32 token, MonoGenericContext *context)
{
int table = mono_metadata_token_table (token);
int idx = mono_metadata_token_index (token);
/* !table is for wrappers: we should really assign their own token to them */
if (!table || table == MONO_TABLE_METHOD)
- return method->signature;
+ return mono_method_signature (method);
if (table == MONO_TABLE_METHODSPEC) {
g_assert (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) &&
!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
- method->signature);
- g_assert (method->signature->is_inflated);
+ mono_method_signature (method));
+ g_assert (method->is_inflated);
- return method->signature;
+ return mono_method_signature (method);
}
- if (method->klass->generic_inst)
- return method->signature;
+ if (method->klass->generic_class)
+ return mono_method_signature (method);
if (image->dynamic)
/* FIXME: This might be incorrect for vararg methods */
- return method->signature;
+ return mono_method_signature (method);
if (!(sig = g_hash_table_lookup (image->memberref_signatures, GUINT_TO_POINTER (token)))) {
mono_metadata_decode_row (&image->tables [MONO_TABLE_MEMBERREF], idx-1, cols, MONO_MEMBERREF_SIZE);
ptr = mono_metadata_blob_heap (image, cols [MONO_MEMBERREF_SIGNATURE]);
mono_metadata_decode_blob_size (ptr, &ptr);
- sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
+ sig = mono_metadata_parse_method_signature_full (image, context, 0, ptr, NULL);
g_hash_table_insert (image->memberref_signatures, GUINT_TO_POINTER (token), sig);
}
+ sig = mono_class_inflate_generic_signature (image, sig, context);
+
return sig;
}
+MonoMethodSignature*
+mono_method_get_signature (MonoMethod *method, MonoImage *image, guint32 token)
+{
+ return mono_method_get_signature_full (method, image, token, NULL);
+}
+
static MonoMethod *
method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *context)
{
- MonoClass *klass;
- MonoMethod *method;
+ MonoClass *klass = NULL;
+ MonoMethod *method = NULL;
MonoTableInfo *tables = image->tables;
guint32 cols[6];
guint32 nindex, class;
+ MonoGenericClass *gclass = NULL;
+ MonoGenericContainer *container = NULL;
const char *mname;
MonoMethodSignature *sig;
const char *ptr;
mono_metadata_string_heap (m, cols [MONO_MEMBERREF_NAME]));*/
mname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
-
- ptr = mono_metadata_blob_heap (image, cols [MONO_MEMBERREF_SIGNATURE]);
- mono_metadata_decode_blob_size (ptr, &ptr);
- sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
switch (class) {
case MONO_MEMBERREF_PARENT_TYPEREF:
klass = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | nindex);
if (!klass) {
g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
- mono_metadata_free_method_signature (sig);
return NULL;
}
- mono_class_init (klass);
+ break;
+ case MONO_MEMBERREF_PARENT_TYPESPEC:
+ klass = mono_class_get_full (image, MONO_TOKEN_TYPE_SPEC | nindex, context);
+ if (!klass) {
+ g_warning ("Missing method %s in assembly %s typespec index %d", mname, image->name, nindex);
+ return NULL;
+ }
+ break;
+ case MONO_MEMBERREF_PARENT_TYPEDEF:
+ klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | nindex);
+ if (!klass) {
+ g_warning ("Missing method %s in assembly %s typedef index %d", mname, image->name, nindex);
+ return NULL;
+ }
+ break;
+ case MONO_MEMBERREF_PARENT_METHODDEF:
+ return mono_get_method (image, MONO_TOKEN_METHOD_DEF | nindex, NULL);
+ default:
+ g_error ("Memberref parent unknown: class: %d, index %d", class, nindex);
+ g_assert_not_reached ();
+ }
+ g_assert (klass);
+
+ if (klass->generic_class) {
+ gclass = klass->generic_class;
+ klass = gclass->container_class;
+ }
+ if (klass->generic_container)
+ container = klass->generic_container;
+ mono_class_init (klass);
+
+ ptr = mono_metadata_blob_heap (image, cols [MONO_MEMBERREF_SIGNATURE]);
+ mono_metadata_decode_blob_size (ptr, &ptr);
+ sig = mono_metadata_parse_method_signature_full (image, (MonoGenericContext *) container, 0, ptr, NULL);
+
+ switch (class) {
+ case MONO_MEMBERREF_PARENT_TYPEREF:
method = find_method (klass, NULL, mname, sig);
if (!method)
g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
mono_metadata_free_method_signature (sig);
- return method;
+ break;
case MONO_MEMBERREF_PARENT_TYPESPEC: {
- guint32 bcols [MONO_TYPESPEC_SIZE];
- guint32 len;
MonoType *type;
MonoMethod *result;
- MonoClass *klass;
- klass = mono_class_get_full (image, MONO_TOKEN_TYPE_SPEC | nindex, context);
type = &klass->byval_arg;
if (type->type != MONO_TYPE_ARRAY && type->type != MONO_TYPE_SZARRAY) {
- mono_class_init (klass);
method = find_method (klass, NULL, mname, sig);
if (!method)
g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
- else if (klass->generic_inst && (klass != method->klass))
+ else if (klass->generic_class && (klass != method->klass))
method = mono_class_inflate_generic_method (
- method, klass->generic_inst->context, klass);
+ method, klass->generic_class->context, klass);
mono_metadata_free_method_signature (sig);
- return method;
+ break;
}
result = (MonoMethod *)g_new0 (MonoMethodPInvoke, 1);
if (!strcmp (mname, ".ctor")) {
/* we special-case this in the runtime. */
- result->addr = NULL;
return result;
}
g_assert (sig->hasthis);
g_assert (type->data.array->rank + 1 == sig->param_count);
result->iflags |= METHOD_IMPL_ATTRIBUTE_RUNTIME;
- result->addr = NULL;
return result;
}
g_assert (sig->hasthis);
g_assert (type->data.array->rank == sig->param_count);
result->iflags |= METHOD_IMPL_ATTRIBUTE_RUNTIME;
- result->addr = NULL;
return result;
}
g_assert (sig->hasthis);
g_assert (type->data.array->rank == sig->param_count);
result->iflags |= METHOD_IMPL_ATTRIBUTE_RUNTIME;
- result->addr = NULL;
return result;
}
break;
}
case MONO_MEMBERREF_PARENT_TYPEDEF:
- klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | nindex);
- if (!klass) {
- g_warning ("Missing method %s in assembly %s typedef index %d", mname, image->name, nindex);
- mono_metadata_free_method_signature (sig);
- return NULL;
- }
- mono_class_init (klass);
method = find_method (klass, NULL, mname, sig);
if (!method)
g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
mono_metadata_free_method_signature (sig);
- return method;
- case MONO_MEMBERREF_PARENT_METHODDEF:
- method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | nindex, NULL);
- return method;
+ break;
default:
g_error ("Memberref parent unknown: class: %d, index %d", class, nindex);
g_assert_not_reached ();
}
- return NULL;
+ if (gclass)
+ method = mono_class_inflate_generic_method (method, gclass->context, gclass->klass);
+
+ return method;
}
static MonoMethod *
-method_from_methodspec (MonoImage *image, guint32 idx)
+method_from_methodspec (MonoImage *image, MonoGenericContext *context, guint32 idx)
{
MonoMethod *method, *inflated;
MonoTableInfo *tables = image->tables;
- MonoGenericContext *context;
+ MonoGenericContext *new_context = NULL;
MonoGenericMethod *gmethod;
+ MonoGenericContainer *container = NULL;
const char *ptr;
guint32 cols [MONO_METHODSPEC_SIZE];
- guint32 token, param_count, i;
+ guint32 token, param_count;
mono_metadata_decode_row (&tables [MONO_TABLE_METHODSPEC], idx - 1, cols, MONO_METHODSPEC_SIZE);
token = cols [MONO_METHODSPEC_METHOD];
ptr++;
param_count = mono_metadata_decode_value (ptr, &ptr);
+ g_assert (param_count);
+ if (method->is_inflated)
+ container = ((MonoMethodNormal *) ((MonoMethodInflated *) method)->declaring)->generic_container;
+ else
+ container = ((MonoMethodNormal *) method)->generic_container;
+ g_assert (container && container->is_method);
+
+ if (context) {
+ g_assert (context->container);
+ container->parent = context->container;
+ if (container->parent->is_method)
+ container->parent = container->parent->parent;
+ }
+
gmethod = g_new0 (MonoGenericMethod, 1);
- gmethod->mtype_argc = param_count;
- gmethod->mtype_argv = g_new0 (MonoType *, param_count);
-
- for (i = 0; i < param_count; i++) {
- gmethod->mtype_argv [i] = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
+ gmethod->container = container;
+
+ gmethod->inst = mono_metadata_parse_generic_inst (
+ image, (MonoGenericContext *) container, param_count, ptr, &ptr);
+
+ if (context)
+ gmethod->inst = mono_metadata_inflate_generic_inst (gmethod->inst, context);
+
+ if (!container->method_hash)
+ container->method_hash = g_hash_table_new (
+ (GHashFunc)mono_metadata_generic_method_hash, (GEqualFunc)mono_metadata_generic_method_equal);
- if (!gmethod->is_open)
- gmethod->is_open = mono_class_is_open_constructed_type (gmethod->mtype_argv [i]);
+ inflated = g_hash_table_lookup (container->method_hash, gmethod);
+ if (inflated) {
+ g_free (gmethod);
+ return inflated;
}
- context = g_new0 (MonoGenericContext, 1);
- context->gmethod = gmethod;
+ if (!context) {
+ new_context = g_new0 (MonoGenericContext, 1);
+ new_context->container = container;
+ new_context->gmethod = gmethod;
+
+ context = new_context;
+ } else {
+ new_context = g_new0 (MonoGenericContext, 1);
+ new_context->container = container;
+ new_context->gmethod = gmethod;
+ new_context->gclass = context->gclass;
+
+ context = new_context;
+ }
mono_stats.generics_metadata_size += sizeof (MonoGenericMethod) +
sizeof (MonoGenericContext) + param_count * sizeof (MonoType);
inflated = mono_class_inflate_generic_method (method, context, NULL);
+ g_hash_table_insert (container->method_hash, gmethod, inflated);
- context->ginst = inflated->klass->generic_inst;
+ if (new_context)
+ context->gclass = inflated->klass->generic_class;
return inflated;
}
mono_loader_unlock ();
}
-static void
-mono_dllmap_free (GHashTable *dll_map)
-{
-}
-
-static int wine_test_needed = 1;
-
gpointer
mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char **exc_arg)
{
g_assert (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL);
- if (exc_class) {
- *exc_class = NULL;
- *exc_arg = NULL;
+ if (piinfo->addr)
+ return piinfo->addr;
+
+ if (method->klass->image->dynamic) {
+ MonoReflectionMethodAux *method_aux =
+ g_hash_table_lookup (
+ ((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
+ if (!method_aux)
+ return NULL;
+
+ import = method_aux->dllentry;
+ orig_scope = method_aux->dll;
}
+ else {
+ if (!piinfo->implmap_idx)
+ return NULL;
- if (method->addr)
- return method->addr;
- if (!piinfo->implmap_idx)
- return NULL;
-
- mono_metadata_decode_row (im, piinfo->implmap_idx - 1, im_cols, MONO_IMPLMAP_SIZE);
+ mono_metadata_decode_row (im, piinfo->implmap_idx - 1, im_cols, MONO_IMPLMAP_SIZE);
- piinfo->piflags = im_cols [MONO_IMPLMAP_FLAGS];
- import = mono_metadata_string_heap (image, im_cols [MONO_IMPLMAP_NAME]);
- scope_token = mono_metadata_decode_row_col (mr, im_cols [MONO_IMPLMAP_SCOPE] - 1, MONO_MODULEREF_NAME);
- orig_scope = mono_metadata_string_heap (image, scope_token);
+ piinfo->piflags = im_cols [MONO_IMPLMAP_FLAGS];
+ import = mono_metadata_string_heap (image, im_cols [MONO_IMPLMAP_NAME]);
+ scope_token = mono_metadata_decode_row_col (mr, im_cols [MONO_IMPLMAP_SCOPE] - 1, MONO_MODULEREF_NAME);
+ orig_scope = mono_metadata_string_heap (image, scope_token);
+ }
mono_dllmap_lookup (image, orig_scope, import, &new_scope, &import);
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT,
"DllImport attempting to load: '%s'.", new_scope);
-#ifndef PLATFORM_WIN32
- /*
- * If we are P/Invoking a library from System.Windows.Forms, load Wine
- */
- if (wine_test_needed && strcmp (image->assembly_name, "System.Windows.Forms") == 0){
- mono_loader_wine_init ();
- wine_test_needed = 0;
+ if (exc_class) {
+ *exc_class = NULL;
+ *exc_arg = NULL;
}
-#endif
-
+
+ /* we allow a special name to dlopen from the running process namespace */
+ if (strcmp (new_scope, "__Internal") == 0)
+ gmodule = g_module_open (NULL, G_MODULE_BIND_LAZY);
+
/*
* Try loading the module using a variety of names
*/
- for (i = 0; i < 2; ++i) {
- if (i == 0)
+ for (i = 0; i < 3; ++i) {
+ switch (i) {
+ case 0:
/* Try the original name */
file_name = g_strdup (new_scope);
- else {
+ break;
+ case 1:
/* Try trimming the .dll extension */
if (strstr (new_scope, ".dll") == (new_scope + strlen (new_scope) - 4)) {
file_name = g_strdup (new_scope);
file_name [strlen (new_scope) - 4] = '\0';
}
else
- break;
+ continue;
+ break;
+ default:
+ if (strstr (new_scope, "lib") != new_scope) {
+ file_name = g_strdup_printf ("lib%s", new_scope);
+ }
+ else
+ continue;
+ break;
}
if (!gmodule) {
if (exc_class) {
*exc_class = "DllNotFoundException";
- *exc_arg = orig_scope;
+ *exc_arg = new_scope;
}
return NULL;
}
if (piinfo->piflags & PINVOKE_ATTRIBUTE_NO_MANGLE) {
- g_module_symbol (gmodule, import, &method->addr);
+ g_module_symbol (gmodule, import, &piinfo->addr);
} else {
char *mangled_name;
switch (piinfo->piflags & PINVOKE_ATTRIBUTE_CHAR_SET_MASK) {
case PINVOKE_ATTRIBUTE_CHAR_SET_UNICODE:
mangled_name = g_strconcat (import, "W", NULL);
- g_module_symbol (gmodule, mangled_name, &method->addr);
+ g_module_symbol (gmodule, mangled_name, &piinfo->addr);
g_free (mangled_name);
- if (!method->addr)
- g_module_symbol (gmodule, import, &method->addr);
+ if (!piinfo->addr)
+ g_module_symbol (gmodule, import, &piinfo->addr);
break;
case PINVOKE_ATTRIBUTE_CHAR_SET_AUTO:
- g_module_symbol (gmodule, import, &method->addr);
+ g_module_symbol (gmodule, import, &piinfo->addr);
break;
case PINVOKE_ATTRIBUTE_CHAR_SET_ANSI:
default:
mangled_name = g_strconcat (import, "A", NULL);
- g_module_symbol (gmodule, mangled_name, &method->addr);
+ g_module_symbol (gmodule, mangled_name, &piinfo->addr);
g_free (mangled_name);
- if (!method->addr)
- g_module_symbol (gmodule, import, &method->addr);
+ if (!piinfo->addr)
+ g_module_symbol (gmodule, import, &piinfo->addr);
break;
}
+
+#ifdef PLATFORM_WIN32
+ /* Try the stdcall mangled name */
+ if (!piinfo->addr) {
+ /* FIX: Compute this correctly */
+ mangled_name = g_strdup_printf ("%s@%d", import, mono_method_signature (method)->param_count * sizeof (gpointer));
+ g_module_symbol (gmodule, mangled_name, &piinfo->addr);
+ g_free (mangled_name);
+ }
+ if (!piinfo->addr) {
+ mangled_name = g_strdup_printf ("_%s@%d", import, mono_method_signature (method)->param_count * sizeof (gpointer));
+ g_module_symbol (gmodule, mangled_name, &piinfo->addr);
+ g_free (mangled_name);
+ }
+#endif
}
- if (!method->addr) {
+ if (!piinfo->addr) {
if (exc_class) {
*exc_class = "EntryPointNotFoundException";
*exc_arg = import;
}
return NULL;
}
- return method->addr;
+ return piinfo->addr;
}
static MonoMethod *
int table = mono_metadata_token_table (token);
int idx = mono_metadata_token_index (token);
MonoTableInfo *tables = image->tables;
- const char *loc, *sig = NULL;
+ MonoGenericContainer *generic_container = NULL, *container = NULL;
+ const char *sig = NULL;
int size, i;
guint32 cols [MONO_TYPEDEF_SIZE];
return mono_lookup_dynamic_token (image, token);
if (table != MONO_TABLE_METHOD) {
+ MonoGenericContainer *generic_container = NULL;
+ if (context) {
+ g_assert (context->container);
+ generic_container = context->container;
+ }
if (table == MONO_TABLE_METHODSPEC)
- return method_from_methodspec (image, idx);
+ return method_from_methodspec (image, context, idx);
if (table != MONO_TABLE_MEMBERREF)
g_print("got wrong token: 0x%08x\n", token);
g_assert (table == MONO_TABLE_MEMBERREF);
result->token = token;
result->name = mono_metadata_string_heap (image, cols [3]);
+ if (klass)
+ container = klass->generic_container;
+
+ if (!(cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
+ (!(cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) || cols [1] & METHOD_IMPL_ATTRIBUTE_NATIVE)) {
+ generic_container = mono_metadata_load_generic_params (image, token, container);
+ if (generic_container)
+ container = generic_container;
+ }
+
if (!sig) /* already taken from the methodref */
sig = mono_metadata_blob_heap (image, cols [4]);
size = mono_metadata_decode_blob_size (sig, &sig);
- result->signature = mono_metadata_parse_method_signature (image, idx, sig, NULL);
+
+ /* there are generic params, or a container. FIXME: be lazy here for generics*/
+ if (* sig & 0x10 || container)
+ result->signature = mono_metadata_parse_method_signature_full (
+ image, (MonoGenericContext *) container, idx, sig, NULL);
+
if (!result->klass) {
guint32 type = mono_metadata_typedef_from_method (image, token);
if (cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
if (result->klass == mono_defaults.string_class && !strcmp (result->name, ".ctor"))
result->string_ctor = 1;
-
- result->signature->pinvoke = 1;
} else if ((cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) && (!(cols [1] & METHOD_IMPL_ATTRIBUTE_NATIVE))) {
MonoMethodPInvoke *piinfo = (MonoMethodPInvoke *)result;
MonoTableInfo *im = &tables [MONO_TABLE_IMPLMAP];
- MonoCallConvention conv = 0;
-
- result->signature->pinvoke = 1;
+
piinfo->implmap_idx = mono_metadata_implmap_from_method (image, idx - 1);
piinfo->piflags = mono_metadata_decode_row_col (im, piinfo->implmap_idx - 1, MONO_IMPLMAP_FLAGS);
-
- switch (piinfo->piflags & PINVOKE_ATTRIBUTE_CALL_CONV_MASK) {
- case PINVOKE_ATTRIBUTE_CALL_CONV_WINAPI:
- conv = MONO_CALL_DEFAULT;
- break;
- case PINVOKE_ATTRIBUTE_CALL_CONV_CDECL:
- conv = MONO_CALL_C;
- break;
- case PINVOKE_ATTRIBUTE_CALL_CONV_STDCALL:
- conv = MONO_CALL_STDCALL;
- break;
- case PINVOKE_ATTRIBUTE_CALL_CONV_THISCALL:
- conv = MONO_CALL_THISCALL;
- break;
- case PINVOKE_ATTRIBUTE_CALL_CONV_FASTCALL:
- conv = MONO_CALL_FASTCALL;
- break;
- case PINVOKE_ATTRIBUTE_CALL_CONV_GENERIC:
- case PINVOKE_ATTRIBUTE_CALL_CONV_GENERICINST:
- default:
- g_warning ("unsupported calling convention");
- g_assert_not_reached ();
- }
- result->signature->call_convention = conv;
} else {
- MonoGenericParam *gen_params = NULL;
-
- /* if this is a methodref from another module/assembly, this fails */
- loc = mono_cli_rva_map ((MonoCLIImageInfo *)image->image_info, cols [0]);
-
- if (result->signature->generic_param_count) {
+ if (result->signature && result->signature->generic_param_count) {
MonoMethodSignature *sig = result->signature;
- gen_params = mono_metadata_load_generic_params (image, token, NULL);
-
for (i = 0; i < sig->generic_param_count; i++) {
- gen_params [i].method = result;
+ generic_container->type_params [i].method = result;
mono_class_from_generic_parameter (
- &gen_params [i], image, TRUE);
+ &generic_container->type_params [i], image, TRUE);
}
if (sig->ret->type == MONO_TYPE_MVAR) {
int num = sig->ret->data.generic_param->num;
- sig->ret->data.generic_param = &gen_params [num];
+ sig->ret->data.generic_param = &generic_container->type_params [num];
}
for (i = 0; i < sig->param_count; i++) {
MonoType *t = sig->params [i];
if (t->type == MONO_TYPE_MVAR) {
int num = t->data.generic_param->num;
- sig->params [i]->data.generic_param = &gen_params [num];
+ sig->params [i]->data.generic_param = &generic_container->type_params [num];
}
}
}
-
+
+ /* FIXME: lazyness for generics too, but how? */
if (!result->klass->dummy && !(result->flags & METHOD_ATTRIBUTE_ABSTRACT) &&
- !(result->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
- MonoMethodNormal *mn = (MonoMethodNormal *) result;
-
+ !(result->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) && container) {
+ gpointer loc = mono_image_rva_map (image, cols [0]);
g_assert (loc);
- mn->header = mono_metadata_parse_mh (image, loc);
- mn->header->gen_params = gen_params;
+ ((MonoMethodNormal *) result)->header = mono_metadata_parse_mh_full (
+ image, (MonoGenericContext *) container, loc);
}
+
+ ((MonoMethodNormal *) result)->generic_container = generic_container;
}
return result;
result = mono_get_method_from_token (image, token, klass, context);
- if (!(result && result->signature->is_inflated))
+ if (!(result && result->is_inflated))
g_hash_table_insert (image->method_cache, GINT_TO_POINTER (token), result);
mono_loader_unlock ();
{
MonoMethod *method, *result;
MonoClass *ic = NULL;
- int i;
+ MonoGenericClass *gclass = NULL;
mono_loader_lock ();
}
mono_class_init (constrained_class);
+ method = mono_get_inflated_method (method);
if ((constrained_class != method->klass) && (method->klass->interface_id != 0))
ic = method->klass;
- result = find_method (constrained_class, ic, method->name, method->signature);
+ if (constrained_class->generic_class)
+ gclass = constrained_class->generic_class;
+
+ result = find_method (constrained_class, ic, method->name, mono_method_signature (method));
if (!result)
g_warning ("Missing method %s in assembly %s token %x", method->name,
image->name, token);
+ if (gclass)
+ result = mono_class_inflate_generic_method (result, gclass->context, gclass->klass);
+
mono_loader_unlock ();
return result;
}
void
mono_free_method (MonoMethod *method)
{
- mono_metadata_free_method_signature (method->signature);
- if (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
- MonoMethodPInvoke *piinfo = (MonoMethodPInvoke *)method;
- g_free (piinfo->code);
- } else if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)) {
+ if (method->signature)
+ mono_metadata_free_method_signature (method->signature);
+ if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) && ((MonoMethodNormal *)method)->header) {
mono_metadata_free_mh (((MonoMethodNormal *)method)->header);
}
MonoTableInfo *methodt;
MonoTableInfo *paramt;
- if (!method->signature->param_count)
+ if (!mono_method_signature (method)->param_count)
return;
- for (i = 0; i < method->signature->param_count; ++i)
+ for (i = 0; i < mono_method_signature (method)->param_count; ++i)
names [i] = "";
- if (klass->generic_inst) /* copy the names later */
+ if (klass->generic_class) /* copy the names later */
return;
mono_class_init (klass);
if (klass->image->dynamic) {
MonoReflectionMethodAux *method_aux =
- mono_g_hash_table_lookup (
+ g_hash_table_lookup (
((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
if (method_aux && method_aux->param_names) {
- for (i = 0; i < method->signature->param_count; ++i)
+ for (i = 0; i < mono_method_signature (method)->param_count; ++i)
if (method_aux->param_names [i + 1])
names [i] = method_aux->param_names [i + 1];
}
}
}
+guint32
+mono_method_get_param_token (MonoMethod *method, int index)
+{
+ int i;
+ MonoClass *klass = method->klass;
+ MonoTableInfo *methodt;
+
+ if (klass->generic_class)
+ g_assert_not_reached ();
+
+ mono_class_init (klass);
+
+ if (klass->image->dynamic) {
+ g_assert_not_reached ();
+ }
+
+ methodt = &klass->image->tables [MONO_TABLE_METHOD];
+ for (i = 0; i < klass->method.count; ++i) {
+ if (method == klass->methods [i]) {
+ guint32 idx = klass->method.first + i;
+ guint param_index = mono_metadata_decode_row_col (methodt, idx, MONO_METHOD_PARAMLIST);
+
+ return mono_metadata_make_token (MONO_TABLE_PARAM, param_index + index);
+ }
+ }
+
+ return 0;
+}
+
void
mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs)
{
MonoTableInfo *methodt;
MonoTableInfo *paramt;
- for (i = 0; i < method->signature->param_count + 1; ++i)
+ for (i = 0; i < mono_method_signature (method)->param_count + 1; ++i)
mspecs [i] = NULL;
if (method->klass->image->dynamic) {
MonoReflectionMethodAux *method_aux =
- mono_g_hash_table_lookup (
+ g_hash_table_lookup (
((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
if (method_aux && method_aux->param_marshall) {
MonoMarshalSpec **dyn_specs = method_aux->param_marshall;
- for (i = 0; i < method->signature->param_count + 1; ++i)
+ for (i = 0; i < mono_method_signature (method)->param_count + 1; ++i)
if (dyn_specs [i]) {
mspecs [i] = g_new0 (MonoMarshalSpec, 1);
memcpy (mspecs [i], dyn_specs [i], sizeof (MonoMarshalSpec));
if (method->klass->image->dynamic) {
MonoReflectionMethodAux *method_aux =
- mono_g_hash_table_lookup (
+ g_hash_table_lookup (
((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
MonoMarshalSpec **dyn_specs = method_aux->param_marshall;
if (dyn_specs) {
- for (i = 0; i < method->signature->param_count + 1; ++i)
+ for (i = 0; i < mono_method_signature (method)->param_count + 1; ++i)
if (dyn_specs [i])
return TRUE;
}
gpointer
mono_method_get_wrapper_data (MonoMethod *method, guint32 id)
{
- GList *l;
+ void **data;
g_assert (method != NULL);
g_assert (method->wrapper_type != MONO_WRAPPER_NONE);
- if (!(l = g_list_nth (((MonoMethodWrapper *)method)->data, id - 1)))
- g_assert_not_reached ();
-
- return l->data;
+ data = ((MonoMethodWrapper *)method)->method_data;
+ g_assert (data != NULL);
+ g_assert (id <= GPOINTER_TO_UINT (*data));
+ return data [id];
}
static void
-default_stack_walk (MonoStackWalk func, gpointer user_data) {
+default_stack_walk (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
g_error ("stack walk not installed");
}
void
mono_stack_walk (MonoStackWalk func, gpointer user_data)
{
- stack_walk (func, user_data);
+ stack_walk (func, FALSE, user_data);
+}
+
+void
+mono_stack_walk_no_il (MonoStackWalk func, gpointer user_data)
+{
+ stack_walk (func, TRUE, user_data);
}
void
mono_method_get_last_managed (void)
{
MonoMethod *m = NULL;
- stack_walk (last_managed, &m);
+ stack_walk (last_managed, FALSE, &m);
return m;
}
-#ifndef PLATFORM_WIN32
-/*
- * This routine exists to load and init Wine due to the special Wine
- * requirements: basically the SharedWineInit must be called before
- * any modules are dlopened or they will fail to work.
- */
-static void
-mono_loader_wine_init ()
-{
- GModule *module = g_module_open ("winelib.exe.so", G_MODULE_BIND_LAZY);
- int (*shared_wine_init)();
-
- if (module == NULL){
- fprintf (stderr, "Could not load winelib.exe.so");
- return;
- }
-
- g_module_symbol (module, "SharedWineInit", &shared_wine_init);
- if (shared_wine_init == NULL)
- return;
-
- shared_wine_init ();
-
- return;
-}
-#endif
-
void
mono_loader_lock (void)
{
}
MonoMethodSignature*
-mono_method_signature (MonoMethod *method)
+mono_method_signature (MonoMethod *m)
{
- return method->signature;
+ int idx;
+ int size;
+ MonoImage* img;
+ const char *sig;
+
+ if (m->signature)
+ return m->signature;
+
+ mono_loader_lock ();
+
+ if (m->signature) {
+ mono_loader_unlock ();
+ return m->signature;
+ }
+
+ g_assert (mono_metadata_token_table (m->token) == MONO_TABLE_METHOD);
+ idx = mono_metadata_token_index (m->token);
+ img = m->klass->image;
+
+ sig = mono_metadata_blob_heap (img, mono_metadata_decode_row_col (&img->tables [MONO_TABLE_METHOD], idx - 1, MONO_METHOD_SIGNATURE));
+ size = mono_metadata_decode_blob_size (sig, &sig);
+
+ m->signature = mono_metadata_parse_method_signature_full (img, NULL, idx, sig, NULL);
+
+ if (m->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
+ m->signature->pinvoke = 1;
+ else if ((m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) && (!(m->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE))) {
+ MonoCallConvention conv = 0;
+ MonoMethodPInvoke *piinfo = (MonoMethodPInvoke *)m;
+ m->signature->pinvoke = 1;
+
+ switch (piinfo->piflags & PINVOKE_ATTRIBUTE_CALL_CONV_MASK) {
+ case PINVOKE_ATTRIBUTE_CALL_CONV_WINAPI:
+ conv = MONO_CALL_DEFAULT;
+ break;
+ case PINVOKE_ATTRIBUTE_CALL_CONV_CDECL:
+ conv = MONO_CALL_C;
+ break;
+ case PINVOKE_ATTRIBUTE_CALL_CONV_STDCALL:
+ conv = MONO_CALL_STDCALL;
+ break;
+ case PINVOKE_ATTRIBUTE_CALL_CONV_THISCALL:
+ conv = MONO_CALL_THISCALL;
+ break;
+ case PINVOKE_ATTRIBUTE_CALL_CONV_FASTCALL:
+ conv = MONO_CALL_FASTCALL;
+ break;
+ case PINVOKE_ATTRIBUTE_CALL_CONV_GENERIC:
+ case PINVOKE_ATTRIBUTE_CALL_CONV_GENERICINST:
+ default:
+ g_warning ("unsupported calling convention");
+ g_assert_not_reached ();
+ }
+ m->signature->call_convention = conv;
+ }
+
+ mono_loader_unlock ();
+ return m->signature;
}
const char*
return method->token;
}
+MonoMethodHeader*
+mono_method_get_header (MonoMethod *method)
+{
+ int idx;
+ guint32 rva;
+ MonoImage* img;
+ gpointer loc;
+ MonoMethodNormal* mn = (MonoMethodNormal*) method;
+
+#ifdef G_LIKELY
+ if (G_LIKELY (mn->header))
+#else
+ if (mn->header)
+#endif
+ return mn->header;
+
+ if (method->klass->dummy || (method->flags & METHOD_ATTRIBUTE_ABSTRACT) || (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) || (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
+ return NULL;
+
+ mono_loader_lock ();
+
+ if (mn->header) {
+ mono_loader_unlock ();
+ return mn->header;
+ }
+
+ g_assert (mono_metadata_token_table (method->token) == MONO_TABLE_METHOD);
+ idx = mono_metadata_token_index (method->token);
+ img = method->klass->image;
+ rva = mono_metadata_decode_row_col (&img->tables [MONO_TABLE_METHOD], idx - 1, MONO_METHOD_RVA);
+ loc = mono_image_rva_map (img, rva);
+
+ g_assert (loc);
+
+ mn->header = mono_metadata_parse_mh_full (img, (MonoGenericContext *) mn->generic_container, loc);
+
+ mono_loader_unlock ();
+ return mn->header;
+}
+
guint32
mono_method_get_flags (MonoMethod *method, guint32 *iflags)
{
projects / mono.git / blobdiff