/*
- * aot.c: mono Ahead of Time compiler
+ * aot-runtime.c: mono Ahead of Time compiler
*
* Author:
* Dietmar Maurer (dietmar@ximian.com)
#endif
#include <fcntl.h>
#include <string.h>
-#ifndef PLATFORM_WIN32
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
-#else
+#endif
+
+#if PLATFORM_WIN32
#include <winsock2.h>
#include <windows.h>
#endif
#include <mono/metadata/metadata-internals.h>
#include <mono/metadata/marshal.h>
#include <mono/metadata/gc-internal.h>
+#include <mono/metadata/monitor.h>
+#include <mono/metadata/threads-types.h>
#include <mono/utils/mono-logger.h>
#include "mono/utils/mono-compiler.h"
#ifdef PLATFORM_WIN32
#define SHARED_EXT ".dll"
-#elif (defined(__ppc__) || defined(__ppc64__)) && defined(__MACH__)
+#elif (defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__)) || defined(__MACH__)
#define SHARED_EXT ".dylib"
#else
#define SHARED_EXT ".so"
guint32 opts;
/* Pointer to the Global Offset Table */
gpointer *got;
- guint32 got_size;
+ guint32 got_size, plt_size;
GHashTable *name_cache;
- GHashTable *wrappers;
+ GHashTable *extra_methods;
+ /* Maps methods to their code */
+ GHashTable *method_to_code;
+ /* Maps pointers into the method info to the methods themselves */
+ GHashTable *method_ref_to_method;
MonoAssemblyName *image_names;
char **image_guids;
MonoAssembly *assembly;
guint8 *code_end;
guint8 *plt;
guint8 *plt_end;
- guint8 *plt_info;
- guint8 *plt_jump_table;
- guint32 plt_jump_table_size;
+ guint32 plt_got_offset_base;
guint32 *code_offsets;
guint8 *method_info;
guint32 *method_info_offsets;
guint32 *class_info_offsets;
guint32 *methods_loaded;
guint16 *class_name_table;
- guint8 *wrapper_info;
+ guint32 *extra_method_table;
+ guint32 *extra_method_info_offsets;
+ guint8 *extra_method_info;
guint8 *trampolines;
- guint32 num_trampolines, first_trampoline_got_offset, trampoline_index;
+ guint32 num_trampolines, trampoline_got_offset_base, trampoline_index;
+ guint32 specific_trampoline_size;
gpointer *globals;
+ MonoDl *sofile;
} MonoAotModule;
+/* This structure is stored in the AOT file */
+typedef struct MonoAotFileInfo
+{
+ guint32 plt_got_offset_base;
+ guint32 trampoline_got_offset_base;
+ guint32 num_trampolines;
+ guint32 got_size;
+ guint32 plt_size;
+ guint32 specific_trampoline_size;
+ gpointer *got;
+} MonoAotFileInfo;
+
static GHashTable *aot_modules;
#define mono_aot_lock() EnterCriticalSection (&aot_mutex)
#define mono_aot_unlock() LeaveCriticalSection (&aot_mutex)
static CRITICAL_SECTION aot_mutex;
+/*
+ * Maps assembly names to the mono_aot_module_<NAME>_info symbols in the
+ * AOT modules registered by mono_aot_register_module ().
+ */
+static GHashTable *static_aot_modules;
+
/*
* Disabling this will make a copy of the loaded code and use the copy instead
* of the original. This will place the caller and the callee close to each
static gint32 mono_last_aot_method = -1;
static gboolean make_unreadable = FALSE;
-static guint32 n_pagefaults = 0;
static guint32 name_table_accesses = 0;
/* Used to speed-up find_aot_module () */
/* Used to communicate with mono_aot_register_globals () */
static guint32 globals_tls_id = -1;
-static gpointer
-mono_aot_load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoMethod *method, guint8 *code, guint8 *info, int method_index);
-
static void
init_plt (MonoAotModule *info);
guint32 got_index, guint32 **got_slots,
guint8 *buf, guint8 **endbuf);
-static inline gboolean
-is_got_patch (MonoJumpInfoType patch_type)
-{
- return TRUE;
-}
-
/*****************************************************/
/* AOT RUNTIME */
/*****************************************************/
return len;
}
+static MonoMethod*
+decode_method_ref_2 (MonoAotModule *module, guint8 *buf, guint8 **endbuf);
+
+static MonoClass*
+decode_klass_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf);
+
+static MonoGenericInst*
+decode_generic_inst (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
+{
+ int type_argc, i;
+ MonoType **type_argv;
+ MonoGenericInst *inst;
+ guint8 *p = buf;
+
+ type_argc = decode_value (p, &p);
+ type_argv = g_new0 (MonoType*, type_argc);
+
+ for (i = 0; i < type_argc; ++i) {
+ MonoClass *pclass = decode_klass_ref (module, p, &p);
+ if (!pclass) {
+ g_free (type_argv);
+ return NULL;
+ }
+ type_argv [i] = &pclass->byval_arg;
+ }
+
+ inst = mono_metadata_get_generic_inst (type_argc, type_argv);
+ g_free (type_argv);
+
+ *endbuf = p;
+
+ return inst;
+}
+
+static gboolean
+decode_generic_context (MonoAotModule *module, MonoGenericContext *ctx, guint8 *buf, guint8 **endbuf)
+{
+ gboolean has_class_inst, has_method_inst;
+ guint8 *p = buf;
+
+ has_class_inst = decode_value (p, &p);
+ if (has_class_inst) {
+ ctx->class_inst = decode_generic_inst (module, p, &p);
+ if (!ctx->class_inst)
+ return FALSE;
+ }
+ has_method_inst = decode_value (p, &p);
+ if (has_method_inst) {
+ ctx->method_inst = decode_generic_inst (module, p, &p);
+ if (!ctx->method_inst)
+ return FALSE;
+ }
+
+ *endbuf = p;
+ return TRUE;
+}
+
static MonoClass*
decode_klass_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
{
MonoImage *image;
MonoClass *klass, *eklass;
guint32 token, rank;
+ guint8 *p = buf;
- token = decode_value (buf, &buf);
+ token = decode_value (p, &p);
if (token == 0) {
- *endbuf = buf;
+ *endbuf = p;
return NULL;
}
if (mono_metadata_token_table (token) == 0) {
- image = load_image (module, decode_value (buf, &buf));
+ image = load_image (module, decode_value (p, &p));
if (!image)
return NULL;
klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF + token);
} else if (mono_metadata_token_table (token) == MONO_TABLE_TYPESPEC) {
if (token == MONO_TOKEN_TYPE_SPEC) {
- MonoClass *gclass;
- int i;
- MonoGenericContext ctx;
- MonoGenericInst inst;
- MonoType *type;
-
- gclass = decode_klass_ref (module, buf, &buf);
- g_assert (gclass->generic_container);
-
- memset (&ctx, 0, sizeof (ctx));
- memset (&inst, 0, sizeof (inst));
- ctx.class_inst = &inst;
- inst.type_argc = decode_value (buf, &buf);
- inst.type_argv = g_new0 (MonoType*, inst.type_argc);
- for (i = 0; i < inst.type_argc; ++i) {
- MonoClass *pclass = decode_klass_ref (module, buf, &buf);
- if (!pclass) {
- g_free (inst.type_argv);
+ MonoTypeEnum type = decode_value (p, &p);
+
+ if (type == MONO_TYPE_GENERICINST) {
+ MonoClass *gclass;
+ MonoGenericContext ctx;
+ MonoType *type;
+
+ gclass = decode_klass_ref (module, p, &p);
+ g_assert (gclass->generic_container);
+
+ memset (&ctx, 0, sizeof (ctx));
+ ctx.class_inst = decode_generic_inst (module, p, &p);
+ if (!ctx.class_inst)
return NULL;
+ type = mono_class_inflate_generic_type (&gclass->byval_arg, &ctx);
+ klass = mono_class_from_mono_type (type);
+ mono_metadata_free_type (type);
+ } else if ((type == MONO_TYPE_VAR) || (type == MONO_TYPE_MVAR)) {
+ MonoType *t;
+ MonoGenericContainer *container;
+
+ int num = decode_value (p, &p);
+ gboolean is_method = decode_value (p, &p);
+
+ if (is_method) {
+ MonoMethod *method_def;
+ g_assert (type == MONO_TYPE_MVAR);
+ method_def = decode_method_ref_2 (module, p, &p);
+ if (!method_def)
+ return NULL;
+
+ container = mono_method_get_generic_container (method_def);
+ } else {
+ MonoClass *class_def;
+ g_assert (type == MONO_TYPE_VAR);
+ class_def = decode_klass_ref (module, p, &p);
+ if (!class_def)
+ return NULL;
+
+ container = class_def->generic_container;
}
- inst.type_argv [i] = &pclass->byval_arg;
+
+ g_assert (container);
+
+ // FIXME: Memory management
+ t = g_new0 (MonoType, 1);
+ t->type = type;
+ t->data.generic_param = mono_generic_container_get_param (container, num);
+
+ // FIXME: Maybe use types directly to avoid
+ // the overhead of creating MonoClass-es
+ klass = mono_class_from_mono_type (t);
+
+ g_free (t);
+ } else {
+ g_assert_not_reached ();
}
- type = mono_class_inflate_generic_type (&gclass->byval_arg, &ctx);
- klass = mono_class_from_mono_type (type);
- mono_metadata_free_type (type);
} else {
- image = load_image (module, decode_value (buf, &buf));
+ image = load_image (module, decode_value (p, &p));
if (!image)
return NULL;
klass = mono_class_get (image, token);
}
} else if (token == MONO_TOKEN_TYPE_DEF) {
/* Array */
- image = load_image (module, decode_value (buf, &buf));
+ image = load_image (module, decode_value (p, &p));
if (!image)
return NULL;
- rank = decode_value (buf, &buf);
- eklass = decode_klass_ref (module, buf, &buf);
+ rank = decode_value (p, &p);
+ eklass = decode_klass_ref (module, p, &p);
klass = mono_array_class_get (eklass, rank);
} else {
g_assert_not_reached ();
g_assert (klass);
mono_class_init (klass);
- *endbuf = buf;
+ *endbuf = p;
return klass;
}
{
MonoClass *klass = decode_klass_ref (module, buf, &buf);
guint32 token;
+ guint8 *p = buf;
if (!klass)
return NULL;
- token = MONO_TOKEN_FIELD_DEF + decode_value (buf, &buf);
+ token = MONO_TOKEN_FIELD_DEF + decode_value (p, &p);
- *endbuf = buf;
+ *endbuf = p;
return mono_class_get_field (klass, token);
}
-static inline MonoImage*
-decode_method_ref (MonoAotModule *module, guint32 *token, guint8 *buf, guint8 **endbuf)
+/*
+ * can_method_ref_match_method:
+ *
+ * Determine if calling decode_method_ref_2 on P could return the same method as
+ * METHOD. This is an optimization to avoid calling decode_method_ref_2 () which
+ * would create MonoMethods which are not needed etc.
+ */
+static gboolean
+can_method_ref_match_method (MonoAotModule *module, guint8 *buf, MonoMethod *method)
{
+ guint8 *p = buf;
guint32 image_index, value;
- MonoImage *image;
- value = decode_value (buf, &buf);
+ /* Keep this in sync with decode_method_ref () */
+ value = decode_value (p, &p);
image_index = value >> 24;
- *token = MONO_TOKEN_METHOD_DEF | (value & 0xffffff);
- if (image_index == 255) {
- /* Methodspec */
- image_index = decode_value (buf, &buf);
- *token = decode_value (buf, &buf);
+ if (image_index == MONO_AOT_METHODREF_WRAPPER) {
+ guint32 wrapper_type;
+
+ if (!method->wrapper_type)
+ return FALSE;
+
+ wrapper_type = decode_value (p, &p);
+
+ if (method->wrapper_type != wrapper_type)
+ return FALSE;
+ } else if (image_index < MONO_AOT_METHODREF_MIN || image_index == MONO_AOT_METHODREF_METHODSPEC || image_index == MONO_AOT_METHODREF_GINST) {
+ if (method->wrapper_type)
+ return FALSE;
}
- *endbuf = buf;
+ return TRUE;
+}
+
+/*
+ * decode_method_ref:
+ *
+ * Decode a method reference, and return its image and token. This avoids loading
+ * metadata for the method if the caller does not need it. If the method has no token,
+ * then it is loaded from metadata and METHOD is set to the method instance.
+ */
+static MonoImage*
+decode_method_ref (MonoAotModule *module, guint32 *token, MonoMethod **method, gboolean *no_aot_trampoline, guint8 *buf, guint8 **endbuf)
+{
+ guint32 image_index, value;
+ MonoImage *image = NULL;
+ guint8 *p = buf;
+
+ if (method)
+ *method = NULL;
+ if (no_aot_trampoline)
+ *no_aot_trampoline = FALSE;
+
+ value = decode_value (p, &p);
+ image_index = value >> 24;
+
+ if (image_index == MONO_AOT_METHODREF_NO_AOT_TRAMPOLINE) {
+ if (no_aot_trampoline)
+ *no_aot_trampoline = TRUE;
+ value = decode_value (p, &p);
+ image_index = value >> 24;
+ }
+
+ if (image_index == MONO_AOT_METHODREF_WRAPPER) {
+ guint32 wrapper_type;
+
+ wrapper_type = decode_value (p, &p);
+
+ /* Doesn't matter */
+ image = mono_defaults.corlib;
+
+ switch (wrapper_type) {
+ case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: {
+ MonoMethod *m = decode_method_ref_2 (module, p, &p);
+
+ if (!m)
+ return NULL;
+ mono_class_init (m->klass);
+ *method = mono_marshal_get_remoting_invoke_with_check (m);
+ break;
+ }
+ case MONO_WRAPPER_PROXY_ISINST: {
+ MonoClass *klass = decode_klass_ref (module, p, &p);
+ if (!klass)
+ return NULL;
+ *method = mono_marshal_get_proxy_cancast (klass);
+ break;
+ }
+ case MONO_WRAPPER_LDFLD:
+ case MONO_WRAPPER_LDFLDA:
+ case MONO_WRAPPER_STFLD:
+ case MONO_WRAPPER_ISINST: {
+ MonoClass *klass = decode_klass_ref (module, p, &p);
+ if (!klass)
+ return NULL;
+ if (wrapper_type == MONO_WRAPPER_LDFLD)
+ *method = mono_marshal_get_ldfld_wrapper (&klass->byval_arg);
+ else if (wrapper_type == MONO_WRAPPER_LDFLDA)
+ *method = mono_marshal_get_ldflda_wrapper (&klass->byval_arg);
+ else if (wrapper_type == MONO_WRAPPER_STFLD)
+ *method = mono_marshal_get_stfld_wrapper (&klass->byval_arg);
+ else if (wrapper_type == MONO_WRAPPER_ISINST)
+ *method = mono_marshal_get_isinst (klass);
+ else
+ g_assert_not_reached ();
+ break;
+ }
+ case MONO_WRAPPER_LDFLD_REMOTE:
+ *method = mono_marshal_get_ldfld_remote_wrapper (NULL);
+ break;
+ case MONO_WRAPPER_STFLD_REMOTE:
+ *method = mono_marshal_get_stfld_remote_wrapper (NULL);
+ break;
+ case MONO_WRAPPER_ALLOC: {
+ int atype = decode_value (p, &p);
+
+ *method = mono_gc_get_managed_allocator_by_type (atype);
+ break;
+ }
+ case MONO_WRAPPER_STELEMREF:
+ *method = mono_marshal_get_stelemref ();
+ break;
+ case MONO_WRAPPER_STATIC_RGCTX_INVOKE: {
+ MonoMethod *m = decode_method_ref_2 (module, p, &p);
+
+ if (!m)
+ return NULL;
+ *method = mono_marshal_get_static_rgctx_invoke (m);
+ break;
+ }
+ case MONO_WRAPPER_UNKNOWN: {
+ MonoMethodDesc *desc;
+ MonoMethod *orig_method;
+ int subtype = decode_value (p, &p);
+
+ if (subtype == MONO_AOT_WRAPPER_MONO_ENTER)
+ desc = mono_method_desc_new ("Monitor:Enter", FALSE);
+ else if (subtype == MONO_AOT_WRAPPER_MONO_EXIT)
+ desc = mono_method_desc_new ("Monitor:Exit", FALSE);
+ else
+ g_assert_not_reached ();
+ orig_method = mono_method_desc_search_in_class (desc, mono_defaults.monitor_class);
+ g_assert (orig_method);
+ mono_method_desc_free (desc);
+ *method = mono_monitor_get_fast_path (orig_method);
+ break;
+ }
+ default:
+ g_assert_not_reached ();
+ }
+ } else if (image_index == MONO_AOT_METHODREF_WRAPPER_NAME) {
+ /* Can't decode these */
+ g_assert_not_reached ();
+ } else if (image_index == MONO_AOT_METHODREF_METHODSPEC) {
+ image_index = decode_value (p, &p);
+ *token = decode_value (p, &p);
+
+ image = load_image (module, image_index);
+ if (!image)
+ return NULL;
+ } else if (image_index == MONO_AOT_METHODREF_GINST) {
+ MonoClass *klass;
+ MonoGenericContext ctx;
+
+ /*
+ * These methods do not have a token which resolves them, so we
+ * resolve them immediately.
+ */
+ klass = decode_klass_ref (module, p, &p);
+ if (!klass)
+ return NULL;
+
+ image_index = decode_value (p, &p);
+ *token = decode_value (p, &p);
+
+ image = load_image (module, image_index);
+ if (!image)
+ return NULL;
+
+ *method = mono_get_method_full (image, *token, NULL, NULL);
+ if (!(*method))
+ return NULL;
+
+ memset (&ctx, 0, sizeof (ctx));
+
+ if (FALSE && klass->generic_class) {
+ ctx.class_inst = klass->generic_class->context.class_inst;
+ ctx.method_inst = NULL;
+
+ *method = mono_class_inflate_generic_method_full (*method, klass, &ctx);
+ }
+
+ memset (&ctx, 0, sizeof (ctx));
+
+ if (!decode_generic_context (module, &ctx, p, &p))
+ return NULL;
+
+ *method = mono_class_inflate_generic_method_full (*method, klass, &ctx);
+ } else if (image_index == MONO_AOT_METHODREF_ARRAY) {
+ MonoClass *klass;
+ int method_type;
+
+ klass = decode_klass_ref (module, p, &p);
+ if (!klass)
+ return NULL;
+ method_type = decode_value (p, &p);
+ *token = 0;
+ switch (method_type) {
+ case 0:
+ *method = mono_class_get_method_from_name (klass, ".ctor", klass->rank);
+ break;
+ case 1:
+ *method = mono_class_get_method_from_name (klass, ".ctor", klass->rank * 2);
+ break;
+ case 2:
+ *method = mono_class_get_method_from_name (klass, "Get", -1);
+ break;
+ case 3:
+ *method = mono_class_get_method_from_name (klass, "Address", -1);
+ break;
+ case 4:
+ *method = mono_class_get_method_from_name (klass, "Set", -1);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+ } else {
+ g_assert (image_index < MONO_AOT_METHODREF_MIN);
+ *token = MONO_TOKEN_METHOD_DEF | (value & 0xffffff);
+
+ image = load_image (module, image_index);
+ if (!image)
+ return NULL;
+ }
+
+ *endbuf = p;
+
+ return image;
+}
+
+/*
+ * decode_method_ref_2:
+ *
+ * Similar to decode_method_ref, but resolve and return the method itself.
+ */
+static MonoMethod*
+decode_method_ref_2 (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
+{
+ MonoMethod *method;
+ guint32 token;
+ MonoImage *image = decode_method_ref (module, &token, &method, NULL, buf, endbuf);
- image = load_image (module, image_index);
+ if (method)
+ return method;
if (!image)
return NULL;
- else
- return image;
+ return mono_get_method (image, token, NULL);
}
G_GNUC_UNUSED
gboolean usable = TRUE;
char *saved_guid = NULL;
char *aot_version = NULL;
- char *runtime_version;
+ char *runtime_version, *build_info;
char *opt_flags = NULL;
gpointer *globals;
gboolean full_aot = FALSE;
- gpointer *plt_jump_table_addr = NULL;
- guint32 *plt_jump_table_size = NULL;
- guint32 *trampolines_info = NULL;
- gpointer *got_addr = NULL;
- gpointer *got = NULL;
- guint32 *got_size_ptr = NULL;
+ MonoAotFileInfo *file_info = NULL;
int i;
if (mono_compile_aot)
return;
- if (assembly->aot_module)
+ if (assembly->image->aot_module)
/*
* Already loaded. This can happen because the assembly loading code might invoke
* the assembly load hooks multiple times for the same assembly.
if (assembly->image->dynamic)
return;
- TlsSetValue (globals_tls_id, NULL);
+ if (mono_security_get_mode () == MONO_SECURITY_MODE_CAS)
+ return;
- if (use_aot_cache)
- assembly->aot_module = load_aot_module_from_cache (assembly, &aot_name);
- else {
- char *err;
- aot_name = g_strdup_printf ("%s%s", assembly->image->name, SHARED_EXT);
+ mono_aot_lock ();
+ if (static_aot_modules)
+ globals = g_hash_table_lookup (static_aot_modules, assembly->aname.name);
+ else
+ globals = NULL;
+ mono_aot_unlock ();
+
+ if (globals) {
+ /* Statically linked AOT module */
+ sofile = NULL;
+ aot_name = g_strdup_printf ("%s", assembly->aname.name);
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "Found statically linked AOT module '%s'.\n", aot_name);
+ } else {
+ TlsSetValue (globals_tls_id, NULL);
+
+ if (use_aot_cache)
+ sofile = load_aot_module_from_cache (assembly, &aot_name);
+ else {
+ char *err;
+ aot_name = g_strdup_printf ("%s%s", assembly->image->name, SHARED_EXT);
- assembly->aot_module = mono_dl_open (aot_name, MONO_DL_LAZY, &err);
+ sofile = mono_dl_open (aot_name, MONO_DL_LAZY, &err);
- if (!assembly->aot_module) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT failed to load AOT module %s: %s\n", aot_name, err);
- g_free (err);
+ if (!sofile) {
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT failed to load AOT module %s: %s\n", aot_name, err);
+ g_free (err);
+ }
}
+
+ /*
+ * If the image was compiled in no-dlsym mode, it contains no global symbols,
+ * instead it contains an ELF ctor function which is called by dlopen () which
+ * in turn calls mono_aot_register_globals () to register a table which contains
+ * the name and address of the globals.
+ */
+ globals = TlsGetValue (globals_tls_id);
+ TlsSetValue (globals_tls_id, NULL);
}
- if (!assembly->aot_module) {
+ if (!sofile && !globals) {
if (mono_aot_only) {
fprintf (stderr, "Failed to load AOT module '%s' in aot-only mode.\n", aot_name);
exit (1);
return;
}
- /*
- * If the image was compiled in no-dlsym mode, it contains no global symbols,
- * instead it contains an ELF ctor functions which is called by dlopen () which
- * in turn calls mono_aot_register_globals () to register a table which contains
- * the name and address of the globals.
- */
- globals = TlsGetValue (globals_tls_id);
- TlsSetValue (globals_tls_id, NULL);
-
- sofile = assembly->aot_module;
-
find_symbol (sofile, globals, "mono_assembly_guid", (gpointer *) &saved_guid);
find_symbol (sofile, globals, "mono_aot_version", (gpointer *) &aot_version);
find_symbol (sofile, globals, "mono_aot_opt_flags", (gpointer *)&opt_flags);
}
}
- if (!runtime_version || ((strlen (runtime_version) > 0 && strcmp (runtime_version, FULL_VERSION)))) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is compiled against runtime version %s while this runtime has version %s.\n", aot_name, runtime_version, FULL_VERSION);
+ build_info = mono_get_runtime_build_info ();
+ if (!runtime_version || ((strlen (runtime_version) > 0 && strcmp (runtime_version, build_info)))) {
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is compiled against runtime version '%s' while this runtime has version '%s'.\n", aot_name, runtime_version, build_info);
usable = FALSE;
}
+ g_free (build_info);
{
char *full_aot_str;
exit (1);
}
g_free (aot_name);
- mono_dl_close (sofile);
- assembly->aot_module = NULL;
+ if (sofile)
+ mono_dl_close (sofile);
+ assembly->image->aot_module = NULL;
return;
}
- find_symbol (sofile, globals, "got_addr", (gpointer *)&got_addr);
- g_assert (got_addr);
- got = (gpointer*)*got_addr;
- g_assert (got);
- find_symbol (sofile, globals, "got_size", (gpointer *)&got_size_ptr);
- g_assert (got_size_ptr);
+ find_symbol (sofile, globals, "mono_aot_file_info", (gpointer*)&file_info);
+ g_assert (file_info);
amodule = g_new0 (MonoAotModule, 1);
amodule->aot_name = aot_name;
amodule->assembly = assembly;
- amodule->got = got;
- amodule->got_size = *got_size_ptr;
+ amodule->plt_got_offset_base = file_info->plt_got_offset_base;
+ amodule->num_trampolines = file_info->num_trampolines;
+ amodule->trampoline_got_offset_base = file_info->trampoline_got_offset_base;
+ amodule->got_size = file_info->got_size;
+ amodule->plt_size = file_info->plt_size;
+ amodule->specific_trampoline_size = file_info->specific_trampoline_size;
+ amodule->got = file_info->got;
amodule->got [0] = assembly->image;
amodule->globals = globals;
+ amodule->sofile = sofile;
+ amodule->method_to_code = g_hash_table_new (mono_aligned_addr_hash, NULL);
sscanf (opt_flags, "%d", &amodule->opts);
find_symbol (sofile, globals, "class_info", (gpointer*)&amodule->class_info);
find_symbol (sofile, globals, "class_info_offsets", (gpointer*)&amodule->class_info_offsets);
find_symbol (sofile, globals, "class_name_table", (gpointer *)&amodule->class_name_table);
+ find_symbol (sofile, globals, "extra_method_table", (gpointer *)&amodule->extra_method_table);
+ find_symbol (sofile, globals, "extra_method_info", (gpointer *)&amodule->extra_method_info);
+ find_symbol (sofile, globals, "extra_method_info_offsets", (gpointer *)&amodule->extra_method_info_offsets);
find_symbol (sofile, globals, "got_info", (gpointer*)&amodule->got_info);
find_symbol (sofile, globals, "got_info_offsets", (gpointer*)&amodule->got_info_offsets);
- find_symbol (sofile, globals, "wrapper_info", (gpointer*)&amodule->wrapper_info);
find_symbol (sofile, globals, "trampolines", (gpointer*)&amodule->trampolines);
find_symbol (sofile, globals, "mem_end", (gpointer*)&amodule->mem_end);
find_symbol (sofile, globals, "plt", (gpointer*)&amodule->plt);
find_symbol (sofile, globals, "plt_end", (gpointer*)&amodule->plt_end);
- find_symbol (sofile, globals, "plt_info", (gpointer*)&amodule->plt_info);
-
- find_symbol (sofile, globals, "plt_jump_table_addr", (gpointer *)&plt_jump_table_addr);
- g_assert (plt_jump_table_addr);
- amodule->plt_jump_table = (guint8*)*plt_jump_table_addr;
- g_assert (amodule->plt_jump_table);
-
- find_symbol (sofile, globals, "plt_jump_table_size", (gpointer *)&plt_jump_table_size);
- g_assert (plt_jump_table_size);
- amodule->plt_jump_table_size = *plt_jump_table_size;
-
- find_symbol (sofile, globals, "trampolines_info", (gpointer *)&trampolines_info);
- if (trampolines_info) {
- amodule->num_trampolines = trampolines_info [0];
- amodule->first_trampoline_got_offset = trampolines_info [1];
- }
if (make_unreadable) {
#ifndef PLATFORM_WIN32
aot_code_low_addr = MIN (aot_code_low_addr, (gsize)amodule->code);
aot_code_high_addr = MAX (aot_code_high_addr, (gsize)amodule->code_end);
- g_hash_table_insert (aot_modules, assembly->image, amodule);
+ g_hash_table_insert (aot_modules, assembly, amodule);
mono_aot_unlock ();
mono_jit_info_add_aot_module (assembly->image, amodule->code, amodule->code_end);
+ assembly->image->aot_module = amodule;
+
/*
* Since we store methoddef and classdef tokens when referring to methods/classes in
* referenced assemblies, we depend on the exact versions of the referenced assemblies.
TlsSetValue (globals_tls_id, globals);
}
+/*
+ * mono_aot_register_module:
+ *
+ * This should be called by embedding code to register AOT modules statically linked
+ * into the executable. AOT_INFO should be the value of the
+ * 'mono_aot_module_<ASSEMBLY_NAME>_info' global symbol from the AOT module.
+ */
+void
+mono_aot_register_module (gpointer *aot_info)
+{
+ gpointer *globals;
+ char *aname;
+
+ globals = aot_info;
+ g_assert (globals);
+
+ /* Determine the assembly name */
+ find_symbol (NULL, globals, "mono_aot_assembly_name", (gpointer*)&aname);
+ g_assert (aname);
+
+ /* This could be called before startup */
+ if (aot_modules)
+ mono_aot_lock ();
+
+ if (!static_aot_modules)
+ static_aot_modules = g_hash_table_new (g_str_hash, g_str_equal);
+
+ g_hash_table_insert (static_aot_modules, aname, globals);
+
+ if (aot_modules)
+ mono_aot_unlock ();
+}
+
void
mono_aot_init (void)
{
info->no_special_static_fields = (flags >> 7) & 0x1;
if (info->has_cctor) {
- MonoImage *cctor_image = decode_method_ref (module, &info->cctor_token, buf, &buf);
+ MonoImage *cctor_image = decode_method_ref (module, &info->cctor_token, NULL, NULL, buf, &buf);
if (!cctor_image)
return FALSE;
}
if (info->has_finalize) {
- info->finalize_image = decode_method_ref (module, &info->finalize_token, buf, &buf);
+ info->finalize_image = decode_method_ref (module, &info->finalize_token, NULL, NULL, buf, &buf);
if (!info->finalize_image)
return FALSE;
}
mono_aot_get_method_from_vt_slot (MonoDomain *domain, MonoVTable *vtable, int slot)
{
int i;
- MonoAotModule *aot_module;
MonoClass *klass = vtable->klass;
+ MonoAotModule *aot_module = klass->image->aot_module;
guint8 *info, *p;
MonoCachedClassInfo class_info;
gboolean err;
guint32 token;
MonoImage *image;
+ gboolean no_aot_trampoline;
- if (MONO_CLASS_IS_INTERFACE (klass) || klass->rank || !klass->image->assembly->aot_module)
- return NULL;
-
- mono_aot_lock ();
-
- aot_module = (MonoAotModule*) g_hash_table_lookup (aot_modules, klass->image);
- if (!aot_module) {
- mono_aot_unlock ();
+ if (MONO_CLASS_IS_INTERFACE (klass) || klass->rank || !aot_module)
return NULL;
- }
info = &aot_module->class_info [aot_module->class_info_offsets [mono_metadata_token_index (klass->type_token) - 1]];
p = info;
err = decode_cached_class_info (aot_module, &class_info, p, &p);
- if (!err) {
- mono_aot_unlock ();
+ if (!err)
return NULL;
- }
for (i = 0; i < slot; ++i)
- decode_method_ref (aot_module, &token, p, &p);
+ decode_method_ref (aot_module, &token, NULL, NULL, p, &p);
- image = decode_method_ref (aot_module, &token, p, &p);
- if (!image) {
- mono_aot_unlock ();
+ image = decode_method_ref (aot_module, &token, NULL, &no_aot_trampoline, p, &p);
+ if (!image)
+ return NULL;
+ if (no_aot_trampoline)
return NULL;
- }
- mono_aot_unlock ();
+ if (mono_metadata_token_index (token) == 0)
+ return NULL;
return mono_aot_get_method_from_token (domain, image, token);
}
gboolean
mono_aot_get_cached_class_info (MonoClass *klass, MonoCachedClassInfo *res)
{
- MonoAotModule *aot_module;
+ MonoAotModule *aot_module = klass->image->aot_module;
guint8 *p;
gboolean err;
- if (klass->rank || !klass->image->assembly->aot_module)
- return FALSE;
-
- mono_aot_lock ();
-
- aot_module = (MonoAotModule*) g_hash_table_lookup (aot_modules, klass->image);
- if (!aot_module) {
- mono_aot_unlock ();
+ if (klass->rank || !aot_module)
return FALSE;
- }
p = (guint8*)&aot_module->class_info [aot_module->class_info_offsets [mono_metadata_token_index (klass->type_token) - 1]];
err = decode_cached_class_info (aot_module, res, p, &p);
- if (!err) {
- mono_aot_unlock ();
+ if (!err)
return FALSE;
- }
-
- mono_aot_unlock ();
return TRUE;
}
gboolean
mono_aot_get_class_from_name (MonoImage *image, const char *name_space, const char *name, MonoClass **klass)
{
- MonoAotModule *aot_module;
+ MonoAotModule *aot_module = image->aot_module;
guint16 *table, *entry;
guint16 table_size;
guint32 hash;
guint32 cols [MONO_TYPEDEF_SIZE];
GHashTable *nspace_table;
- if (!aot_modules)
+ if (!aot_module || !aot_module->class_name_table)
return FALSE;
mono_aot_lock ();
- aot_module = (MonoAotModule*) g_hash_table_lookup (aot_modules, image);
- if (!aot_module || !aot_module->class_name_table) {
- mono_aot_unlock ();
- return FALSE;
- }
-
*klass = NULL;
/* First look in the cache */
return TRUE;
}
+/*
+ * LOCKING: Acquires the domain lock.
+ */
static MonoJitInfo*
decode_exception_debug_info (MonoAotModule *aot_module, MonoDomain *domain,
MonoMethod *method, guint8* ex_info, guint8 *code)
{
int i, buf_len;
MonoJitInfo *jinfo;
- guint code_len, used_int_regs;
- guint8 *p;
+ guint code_len, used_int_regs, flags;
+ gboolean has_generic_jit_info, has_dwarf_unwind_info;
+ guint8 *p, *unwind_info_block;
MonoMethodHeader *header;
+ int generic_info_size, unwind_info_len;
header = mono_method_get_header (method);
p = ex_info;
code_len = decode_value (p, &p);
- used_int_regs = decode_value (p, &p);
+ flags = decode_value (p, &p);
+ has_generic_jit_info = (flags & 1) != 0;
+ has_dwarf_unwind_info = (flags & 2) != 0;
+ unwind_info_block = p;
+ if (has_dwarf_unwind_info) {
+ gssize offset;
+
+ unwind_info_len = decode_value (p, &p);
+ offset = unwind_info_block - (guint8*)aot_module->ex_info;
+ g_assert (offset > 0 && offset < (1 << 30));
+ used_int_regs = offset;
+ p += unwind_info_len;
+ } else {
+ used_int_regs = decode_value (p, &p);
+ }
+ if (has_generic_jit_info)
+ generic_info_size = sizeof (MonoGenericJitInfo);
+ else
+ generic_info_size = 0;
/* Exception table */
if (header && header->num_clauses) {
jinfo =
- mono_mempool_alloc0 (domain->mp, sizeof (MonoJitInfo) + (sizeof (MonoJitExceptionInfo) * header->num_clauses));
+ mono_domain_alloc0 (domain, sizeof (MonoJitInfo) + (sizeof (MonoJitExceptionInfo) * header->num_clauses) + generic_info_size);
jinfo->num_clauses = header->num_clauses;
for (i = 0; i < header->num_clauses; ++i) {
ei->handler_start = code + decode_value (p, &p);
}
}
- else
- jinfo = mono_mempool_alloc0 (domain->mp, sizeof (MonoJitInfo));
+ else {
+ jinfo = mono_domain_alloc0 (domain, sizeof (MonoJitInfo) + generic_info_size);
+ }
jinfo->code_size = code_len;
jinfo->used_regs = used_int_regs;
jinfo->method = method;
jinfo->code_start = code;
jinfo->domain_neutral = 0;
+ jinfo->from_aot = 1;
+
+ if (has_generic_jit_info) {
+ MonoGenericJitInfo *gi;
+
+ jinfo->has_generic_jit_info = 1;
+
+ gi = mono_jit_info_get_generic_jit_info (jinfo);
+ g_assert (gi);
+
+ gi->has_this = decode_value (p, &p);
+ gi->this_reg = decode_value (p, &p);
+ gi->this_offset = decode_value (p, &p);
+
+ /* This currently contains no data */
+ gi->generic_sharing_context = g_new0 (MonoGenericSharingContext, 1);
+
+ jinfo->method = decode_method_ref_2 (aot_module, p, &p);
+ }
/* Load debug info */
buf_len = decode_value (p, &p);
return jinfo;
}
+/*
+ * mono_aot_get_unwind_info:
+ *
+ * Return a pointer to the DWARF unwind info belonging to JI.
+ */
+guint8*
+mono_aot_get_unwind_info (MonoJitInfo *ji, guint32 *unwind_info_len)
+{
+ MonoAotModule *amodule = ji->method->klass->image->aot_module;
+ guint8 *p;
+
+ g_assert (amodule);
+ g_assert (ji->from_aot);
+
+ p = amodule->ex_info + ji->used_regs;
+ *unwind_info_len = decode_value (p, &p);
+ return p;
+}
+
MonoJitInfo *
mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
{
- MonoAssembly *ass = image->assembly;
- MonoDl *module = ass->aot_module;
- int pos, left, right, offset, offset1, offset2, last_offset, new_offset, page_index, method_index, table_len;
+
+ int pos, left, right, offset, offset1, offset2, last_offset, new_offset;
+ int page_index, method_index, table_len, is_wrapper;
guint32 token;
- MonoAotModule *aot_module;
+ MonoAotModule *amodule = image->aot_module;
MonoMethod *method;
MonoJitInfo *jinfo;
- guint8 *code, *ex_info;
+ guint8 *code, *ex_info, *p;
guint32 *table, *ptr;
gboolean found;
- if (!module)
+ if (!amodule)
return NULL;
- aot_module = (MonoAotModule*) g_hash_table_lookup (aot_modules, image);
-
if (domain != mono_get_root_domain ())
/* FIXME: */
return NULL;
- offset = (guint8*)addr - aot_module->code;
+ offset = (guint8*)addr - amodule->code;
/* First search through the index */
- ptr = aot_module->method_order;
+ ptr = amodule->method_order;
last_offset = 0;
page_index = 0;
found = FALSE;
while (*ptr != 0xffffff) {
guint32 method_index = ptr [0];
- new_offset = aot_module->code_offsets [method_index];
+ new_offset = amodule->code_offsets [method_index];
if (offset >= last_offset && offset < new_offset) {
found = TRUE;
ptr ++;
table = ptr;
- table_len = aot_module->method_order_end - table;
+ table_len = amodule->method_order_end - table;
- g_assert (table <= aot_module->method_order_end);
+ g_assert (table <= amodule->method_order_end);
if (found) {
left = (page_index * 1024);
if (right > table_len)
right = table_len;
- offset1 = aot_module->code_offsets [table [left]];
+ offset1 = amodule->code_offsets [table [left]];
g_assert (offset1 <= offset);
//printf ("Found in index: 0x%x 0x%x 0x%x\n", offset, last_offset, new_offset);
while (TRUE) {
pos = (left + right) / 2;
- g_assert (table + pos <= aot_module->method_order_end);
+ g_assert (table + pos <= amodule->method_order_end);
- //printf ("Pos: %5d < %5d < %5d Offset: 0x%05x < 0x%05x < 0x%05x\n", left, pos, right, aot_module->code_offsets [table [left]], offset, aot_module->code_offsets [table [right]]);
+ //printf ("Pos: %5d < %5d < %5d Offset: 0x%05x < 0x%05x < 0x%05x\n", left, pos, right, amodule->code_offsets [table [left]], offset, amodule->code_offsets [table [right]]);
- offset1 = aot_module->code_offsets [table [pos]];
- if (table + pos + 1 >= aot_module->method_order_end)
- offset2 = aot_module->code_end - aot_module->code;
+ offset1 = amodule->code_offsets [table [pos]];
+ if (table + pos + 1 >= amodule->method_order_end)
+ offset2 = amodule->code_end - amodule->code;
else
- offset2 = aot_module->code_offsets [table [pos + 1]];
+ offset2 = amodule->code_offsets [table [pos + 1]];
if (offset < offset1)
right = pos;
method_index = table [pos];
- /* Might be a wrapper */
- if (aot_module->wrappers) {
+ /* Might be a wrapper/extra method */
+ if (amodule->extra_methods) {
mono_aot_lock ();
- method = g_hash_table_lookup (aot_module->wrappers, GUINT_TO_POINTER (method_index));
+ method = g_hash_table_lookup (amodule->extra_methods, GUINT_TO_POINTER (method_index));
mono_aot_unlock ();
} else {
method = NULL;
}
if (!method) {
- token = mono_metadata_make_token (MONO_TABLE_METHOD, method_index + 1);
- method = mono_get_method (image, token, NULL);
+ if (method_index >= image->tables [MONO_TABLE_METHOD].rows) {
+ /*
+ * This is hit for extra methods which are called directly, so they are
+ * not in amodule->extra_methods.
+ */
+ table_len = amodule->extra_method_info_offsets [0];
+ table = amodule->extra_method_info_offsets + 1;
+ left = 0;
+ right = table_len;
+ pos = 0;
+
+ /* Binary search */
+ while (TRUE) {
+ pos = ((left + right) / 2);
+
+ g_assert (pos < table_len);
+
+ if (table [pos * 2] < method_index)
+ left = pos + 1;
+ else if (table [pos * 2] > method_index)
+ right = pos;
+ else
+ break;
+ }
+
+ p = amodule->extra_method_info + table [(pos * 2) + 1];
+ is_wrapper = decode_value (p, &p);
+ g_assert (!is_wrapper);
+ method = decode_method_ref_2 (amodule, p, &p);
+ g_assert (method);
+ } else {
+ token = mono_metadata_make_token (MONO_TABLE_METHOD, method_index + 1);
+ method = mono_get_method (image, token, NULL);
+ }
}
/* FIXME: */
//printf ("F: %s\n", mono_method_full_name (method, TRUE));
- code = &aot_module->code [aot_module->code_offsets [method_index]];
- ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [method_index]];
+ code = &amodule->code [amodule->code_offsets [method_index]];
+ ex_info = &amodule->ex_info [amodule->ex_info_offsets [method_index]];
- jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
+ jinfo = decode_exception_debug_info (amodule, domain, method, ex_info, code);
g_assert ((guint8*)addr >= (guint8*)jinfo->code_start);
g_assert ((guint8*)addr < (guint8*)jinfo->code_start + jinfo->code_size);
return jinfo;
}
+/* Keep it in sync with the version in aot-compiler.c */
+static inline gboolean
+is_shared_got_patch (MonoJumpInfo *patch_info)
+{
+ switch (patch_info->type) {
+ case MONO_PATCH_INFO_VTABLE:
+ case MONO_PATCH_INFO_CLASS:
+ case MONO_PATCH_INFO_IID:
+ case MONO_PATCH_INFO_ADJUSTED_IID:
+ case MONO_PATCH_INFO_FIELD:
+ case MONO_PATCH_INFO_SFLDA:
+ case MONO_PATCH_INFO_DECLSEC:
+ case MONO_PATCH_INFO_LDTOKEN:
+ case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
+ case MONO_PATCH_INFO_RVA:
+ case MONO_PATCH_INFO_METHODCONST:
+ case MONO_PATCH_INFO_IMAGE:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
static gboolean
-decode_patch_info (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guint8 *buf, guint8 **endbuf, guint32 *got_offset)
+decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guint8 *buf, guint8 **endbuf)
{
guint8 *p = buf;
gpointer *table;
switch (ji->type) {
case MONO_PATCH_INFO_METHOD:
- case MONO_PATCH_INFO_METHODCONST:
case MONO_PATCH_INFO_METHOD_JUMP:
- case MONO_PATCH_INFO_ICALL_ADDR: {
+ case MONO_PATCH_INFO_ICALL_ADDR:
+ case MONO_PATCH_INFO_METHOD_RGCTX: {
guint32 token;
+ MonoMethod *method;
+ gboolean no_aot_trampoline;
- image = decode_method_ref (aot_module, &token, p, &p);
+ image = decode_method_ref (aot_module, &token, &method, &no_aot_trampoline, p, &p);
if (!image)
goto cleanup;
#ifdef MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
- if (!mono_aot_only && (ji->type == MONO_PATCH_INFO_METHOD) && (mono_metadata_token_table (token) == MONO_TABLE_METHOD)) {
+ if (!method && !mono_aot_only && !no_aot_trampoline && (ji->type == MONO_PATCH_INFO_METHOD) && (mono_metadata_token_table (token) == MONO_TABLE_METHOD)) {
ji->data.target = mono_create_jit_trampoline_from_token (image, token);
ji->type = MONO_PATCH_INFO_ABS;
}
else {
- ji->data.method = mono_get_method (image, token, NULL);
+ if (method)
+ ji->data.method = method;
+ else
+ ji->data.method = mono_get_method (image, token, NULL);
g_assert (ji->data.method);
mono_class_init (ji->data.method->klass);
}
break;
}
- case MONO_PATCH_INFO_WRAPPER: {
- guint32 wrapper_type;
-
- wrapper_type = decode_value (p, &p);
-
- ji->type = MONO_PATCH_INFO_METHOD;
-
- switch (wrapper_type) {
- case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: {
- guint32 image_index, token, value;
-
- value = decode_value (p, &p);
- image_index = value >> 24;
- token = MONO_TOKEN_METHOD_DEF | (value & 0xffffff);
-
- image = load_image (aot_module, image_index);
- if (!image)
- goto cleanup;
- ji->data.method = mono_get_method (image, token, NULL);
- g_assert (ji->data.method);
- mono_class_init (ji->data.method->klass);
-
- ji->data.method = mono_marshal_get_remoting_invoke_with_check (ji->data.method);
- break;
- }
- case MONO_WRAPPER_PROXY_ISINST: {
- MonoClass *klass = decode_klass_ref (aot_module, p, &p);
- if (!klass)
- goto cleanup;
- ji->data.method = mono_marshal_get_proxy_cancast (klass);
- break;
- }
- case MONO_WRAPPER_LDFLD:
- case MONO_WRAPPER_LDFLDA:
- case MONO_WRAPPER_STFLD:
- case MONO_WRAPPER_ISINST: {
- MonoClass *klass = decode_klass_ref (aot_module, p, &p);
- if (!klass)
- goto cleanup;
- if (wrapper_type == MONO_WRAPPER_LDFLD)
- ji->data.method = mono_marshal_get_ldfld_wrapper (&klass->byval_arg);
- else if (wrapper_type == MONO_WRAPPER_LDFLDA)
- ji->data.method = mono_marshal_get_ldflda_wrapper (&klass->byval_arg);
- else if (wrapper_type == MONO_WRAPPER_STFLD)
- ji->data.method = mono_marshal_get_stfld_wrapper (&klass->byval_arg);
- else if (wrapper_type == MONO_WRAPPER_ISINST)
- ji->data.method = mono_marshal_get_isinst (klass);
- else
- g_assert_not_reached ();
- break;
- }
- case MONO_WRAPPER_LDFLD_REMOTE:
- ji->data.method = mono_marshal_get_ldfld_remote_wrapper (NULL);
- break;
- case MONO_WRAPPER_STFLD_REMOTE:
- ji->data.method = mono_marshal_get_stfld_remote_wrapper (NULL);
- break;
- case MONO_WRAPPER_ALLOC: {
- int atype = decode_value (p, &p);
-
- ji->data.method = mono_gc_get_managed_allocator_by_type (atype);
- break;
- }
- case MONO_WRAPPER_STELEMREF:
- ji->data.method = mono_marshal_get_stelemref ();
- break;
- default:
- g_assert_not_reached ();
- }
- break;
- }
case MONO_PATCH_INFO_INTERNAL_METHOD:
case MONO_PATCH_INFO_JIT_ICALL_ADDR: {
guint32 len = decode_value (p, &p);
p += len + 1;
break;
}
+ case MONO_PATCH_INFO_METHODCONST:
+ /* Shared */
+ ji->data.method = decode_method_ref_2 (aot_module, p, &p);
+ if (!ji->data.method)
+ goto cleanup;
+ break;
case MONO_PATCH_INFO_VTABLE:
case MONO_PATCH_INFO_CLASS:
case MONO_PATCH_INFO_IID:
case MONO_PATCH_INFO_ADJUSTED_IID:
- *got_offset = decode_value (p, &p);
-
- if (aot_module->got [*got_offset]) {
- /* Already loaded */
- //printf ("HIT!\n");
- } else {
- guint8 *tmp = aot_module->got_info + aot_module->got_info_offsets [*got_offset];
- ji->data.klass = decode_klass_ref (aot_module, tmp, &tmp);
- if (!ji->data.klass)
- goto cleanup;
- }
+ /* Shared */
+ ji->data.klass = decode_klass_ref (aot_module, p, &p);
+ if (!ji->data.klass)
+ goto cleanup;
break;
case MONO_PATCH_INFO_CLASS_INIT:
case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
ji->data.image = load_image (aot_module, decode_value (p, &p));
if (!ji->data.image)
goto cleanup;
- if (ji->data.image == aot_module->assembly->image)
- *got_offset = 0;
break;
case MONO_PATCH_INFO_FIELD:
case MONO_PATCH_INFO_SFLDA:
- *got_offset = decode_value (p, &p);
-
- if (aot_module->got [*got_offset]) {
- /* Already loaded */
- //printf ("HIT2!\n");
- } else {
- guint8 *tmp = aot_module->got_info + aot_module->got_info_offsets [*got_offset];
- ji->data.field = decode_field_info (aot_module, tmp, &tmp);
- if (!ji->data.field)
- goto cleanup;
- }
+ /* Shared */
+ ji->data.field = decode_field_info (aot_module, p, &p);
+ if (!ji->data.field)
+ goto cleanup;
break;
case MONO_PATCH_INFO_SWITCH:
ji->data.table = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoBBTable));
case MONO_PATCH_INFO_DECLSEC:
case MONO_PATCH_INFO_LDTOKEN:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
- *got_offset = decode_value (p, &p);
+ /* Shared */
+ image = load_image (aot_module, decode_value (p, &p));
+ if (!image)
+ goto cleanup;
+ ji->data.token = mono_jump_info_token_new (mp, image, decode_value (p, &p));
- if (aot_module->got [*got_offset]) {
- /* Already loaded */
- } else {
- guint8 *tmp = aot_module->got_info + aot_module->got_info_offsets [*got_offset];
- image = load_image (aot_module, decode_value (tmp, &tmp));
- if (!image)
+ ji->data.token->has_context = decode_value (p, &p);
+ if (ji->data.token->has_context) {
+ gboolean res = decode_generic_context (aot_module, &ji->data.token->context, p, &p);
+ if (!res)
goto cleanup;
- ji->data.token = mono_jump_info_token_new (mp, image, decode_value (tmp, &tmp));
}
break;
case MONO_PATCH_INFO_EXC_NAME:
ji->data.offset = decode_value (p, &p);
break;
case MONO_PATCH_INFO_INTERRUPTION_REQUEST_FLAG:
+ case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
+ case MONO_PATCH_INFO_MONITOR_ENTER:
+ case MONO_PATCH_INFO_MONITOR_EXIT:
+ break;
+ case MONO_PATCH_INFO_RGCTX_FETCH: {
+ gboolean res;
+ MonoJumpInfoRgctxEntry *entry;
+
+ entry = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoRgctxEntry));
+ entry->method = decode_method_ref_2 (aot_module, p, &p);
+ entry->in_mrgctx = decode_value (p, &p);
+ entry->info_type = decode_value (p, &p);
+ entry->data = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo));
+ entry->data->type = decode_value (p, &p);
+
+ res = decode_patch (aot_module, mp, entry->data, p, &p);
+ if (!res)
+ goto cleanup;
+ ji->data.rgctx_entry = entry;
break;
+ }
default:
g_warning ("unhandled type %d", ji->type);
g_assert_not_reached ();
return FALSE;
}
+/*
+ * decode_got_entry:
+ *
+ * Decode a reference to a GOT entry. GOT_OFFSET is set to the index of the got
+ * entry. If that got entry is not already filled out, then JI is filled out with
+ * the information required to resolve the value of the GOT entry.
+ * FIXME: Clean up this confusing API.
+ */
+static gboolean
+decode_got_entry (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guint8 *buf, guint8 **endbuf, guint32 *got_offset)
+{
+ guint8 *p = buf;
+ guint8 *shared_p;
+ gboolean res;
+
+ if (is_shared_got_patch (ji)) {
+ *got_offset = decode_value (p, &p);
+
+ if (aot_module->got [*got_offset]) {
+ /* Already loaded */
+ //printf ("HIT!\n");
+ } else {
+ shared_p = aot_module->got_info + aot_module->got_info_offsets [*got_offset];
+
+ res = decode_patch (aot_module, mp, ji, shared_p, &shared_p);
+ if (!res)
+ return FALSE;
+ }
+ } else {
+ res = decode_patch (aot_module, mp, ji, p, &p);
+ if (!res)
+ return FALSE;
+ }
+
+ *endbuf = p;
+ return TRUE;
+}
+
static MonoJumpInfo*
load_patch_info (MonoAotModule *aot_module, MonoMemPool *mp, int n_patches,
guint32 got_index, guint32 **got_slots,
for (pindex = 0; pindex < n_patches; ++pindex) {
MonoJumpInfo *ji = &patches [pindex];
- if (!decode_patch_info (aot_module, mp, ji, p, &p, (*got_slots) + pindex))
+ if (!decode_got_entry (aot_module, mp, ji, p, &p, (*got_slots) + pindex))
goto cleanup;
if ((*got_slots) [pindex] == 0xffffffff)
return NULL;
}
+static void
+register_jump_target_got_slot (MonoDomain *domain, MonoMethod *method, gpointer *got_slot)
+{
+ /*
+ * Jump addresses cannot be patched by the trampoline code since it
+ * does not have access to the caller's address. Instead, we collect
+ * the addresses of the GOT slots pointing to a method, and patch
+ * them after the method has been compiled.
+ */
+ MonoJitDomainInfo *info = domain_jit_info (domain);
+ GSList *list;
+
+ mono_domain_lock (domain);
+ if (!info->jump_target_got_slot_hash)
+ info->jump_target_got_slot_hash = g_hash_table_new (NULL, NULL);
+ list = g_hash_table_lookup (info->jump_target_got_slot_hash, method);
+ list = g_slist_prepend (list, got_slot);
+ g_hash_table_insert (info->jump_target_got_slot_hash, method, list);
+ mono_domain_unlock (domain);
+}
+
+/*
+ * load_method:
+ *
+ * Load the method identified by METHOD_INDEX from the AOT image. Return a
+ * pointer to the native code of the method, or NULL if not found.
+ * METHOD might not be set if the caller only has the image/token info.
+ */
static gpointer
-mono_aot_get_method_inner (MonoDomain *domain, MonoMethod *method)
+load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoImage *image, MonoMethod *method, guint32 token, int method_index)
{
- MonoClass *klass = method->klass;
- MonoAssembly *ass = klass->image->assembly;
- MonoDl *module = ass->aot_module;
- guint32 method_index = mono_metadata_token_index (method->token) - 1;
+ MonoClass *klass;
+ gboolean from_plt = method == NULL;
+ MonoMemPool *mp;
+ int i, pindex, got_index = 0, n_patches, used_strings;
+ gboolean keep_patches = TRUE;
+ guint8 *p, *ex_info;
+ MonoJitInfo *jinfo = NULL;
guint8 *code, *info;
- MonoAotModule *aot_module;
-
- if (!module)
- return NULL;
if (mono_profiler_get_events () & MONO_PROFILE_ENTER_LEAVE)
return NULL;
- if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
- (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
- (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
- (method->flags & METHOD_ATTRIBUTE_ABSTRACT))
- return NULL;
-
- aot_module = (MonoAotModule*) g_hash_table_lookup (aot_modules, klass->image);
-
- g_assert (klass->inited);
-
if ((domain != mono_get_root_domain ()) && (!(aot_module->opts & MONO_OPT_SHARED)))
/* Non shared AOT code can't be used in other appdomains */
return NULL;
if (aot_module->out_of_date)
return NULL;
- if (method->is_inflated) {
- if (!mono_method_is_generic_sharable_impl (method, FALSE))
- return NULL;
- method = mono_method_get_declaring_generic_method (method);
- }
-
- if (!method->token) {
- char *full_name;
- char *p;
-
- if (!method->wrapper_type || !aot_module->wrapper_info)
- return NULL;
-
- /* Try to find the wrapper among the wrapper info */
- full_name = mono_method_full_name (method, TRUE);
- p = (char*)aot_module->wrapper_info;
- while (*p) {
- char *end;
-
- end = p + strlen (p) + 1;
- end = ALIGN_PTR_TO (end, 4);
- method_index = *(guint32*)end;
- end += 4;
- if (strcmp (full_name, p) == 0)
- break;
- p = end;
- }
- g_free (full_name);
-
- if (!(*p))
- /* Not found */
- return NULL;
-
- /* Needed by find_jit_info */
- mono_aot_lock ();
- if (!aot_module->wrappers)
- aot_module->wrappers = g_hash_table_new (NULL, NULL);
- g_hash_table_insert (aot_module->wrappers, GUINT_TO_POINTER (method_index), method);
- mono_aot_unlock ();
- }
-
if (aot_module->code_offsets [method_index] == 0xffffffff) {
if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
- char *full_name = mono_method_full_name (method, TRUE);
+ char *full_name;
+
+ if (!method)
+ method = mono_get_method (image, token, NULL);
+ full_name = mono_method_full_name (method, TRUE);
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT NOT FOUND: %s.\n", full_name);
g_free (full_name);
}
code = &aot_module->code [aot_module->code_offsets [method_index]];
info = &aot_module->method_info [aot_module->method_info_offsets [method_index]];
+ mono_aot_lock ();
if (!aot_module->methods_loaded)
- aot_module->methods_loaded = g_new0 (guint32, klass->image->tables [MONO_TABLE_METHOD].rows + 1);
+ aot_module->methods_loaded = g_new0 (guint32, image->tables [MONO_TABLE_METHOD].rows + 1);
+ mono_aot_unlock ();
if ((aot_module->methods_loaded [method_index / 32] >> (method_index % 32)) & 0x1)
return code;
if (mono_jit_stats.methods_aot > mono_last_aot_method)
return NULL;
else
- if (mono_jit_stats.methods_aot == mono_last_aot_method)
- printf ("LAST AOT METHOD: %s.%s.%s.\n", klass->name_space, klass->name, method->name);
+ if (method && mono_jit_stats.methods_aot == mono_last_aot_method)
+ printf ("LAST AOT METHOD: %s.%s.%s.\n", method->klass->name_space, method->klass->name, method->name);
}
- return mono_aot_load_method (domain, aot_module, method, code, info, method_index);
-}
-
-static gpointer
-mono_aot_load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoMethod *method, guint8 *code, guint8 *info, int method_index)
-{
- MonoClass *klass = method->klass;
- MonoJumpInfo *patch_info = NULL;
- MonoMemPool *mp;
- int i, pindex, got_index = 0, n_patches, used_strings;
- gboolean non_got_patches, keep_patches = TRUE;
- guint8 *p, *ex_info;
- MonoJitInfo *jinfo = NULL;
-
p = info;
- decode_klass_ref (aot_module, p, &p);
+
+ if (method) {
+ klass = method->klass;
+ decode_klass_ref (aot_module, p, &p);
+ } else {
+ klass = decode_klass_ref (aot_module, p, &p);
+ }
if (!use_loaded_code) {
guint8 *code2;
if (!jinfo) {
- ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [mono_metadata_token_index (method->token) - 1]];
+ ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [mono_metadata_token_index (token) - 1]];
jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
}
- code2 = mono_code_manager_reserve (domain->code_mp, jinfo->code_size);
+ code2 = mono_domain_code_reserve (domain, jinfo->code_size);
memcpy (code2, code, jinfo->code_size);
mono_arch_flush_icache (code2, jinfo->code_size);
- code = code2;
- }
-
- if (aot_module->opts & MONO_OPT_SHARED)
- used_strings = decode_value (p, &p);
- else
- used_strings = 0;
-
- for (i = 0; i < used_strings; i++) {
- guint token = decode_value (p, &p);
- mono_ldstr (mono_get_root_domain (), klass->image, mono_metadata_token_index (token));
- }
-
- if (aot_module->opts & MONO_OPT_SHARED)
- keep_patches = FALSE;
-
- n_patches = decode_value (p, &p);
-
- keep_patches = FALSE;
-
- if (n_patches) {
- MonoJumpInfo *patches;
- guint32 *got_slots;
-
- if (keep_patches)
- mp = domain->mp;
- else
- mp = mono_mempool_new ();
-
- got_index = decode_value (p, &p);
-
- patches = load_patch_info (aot_module, mp, n_patches, got_index, &got_slots, p, &p);
- if (patches == NULL)
- goto cleanup;
-
- /* Do this outside the lock to avoid deadlocks */
- mono_aot_unlock ();
- non_got_patches = FALSE;
- for (pindex = 0; pindex < n_patches; ++pindex) {
- MonoJumpInfo *ji = &patches [pindex];
-
- if (is_got_patch (ji->type)) {
- if (!aot_module->got [got_slots [pindex]])
- aot_module->got [got_slots [pindex]] = mono_resolve_patch_target (method, domain, code, ji, TRUE);
- ji->type = MONO_PATCH_INFO_NONE;
- }
- else
- non_got_patches = TRUE;
- }
- if (non_got_patches) {
- if (!jinfo) {
- ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [mono_metadata_token_index (method->token) - 1]];
- jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
- }
-
- mono_arch_flush_icache (code, jinfo->code_size);
- make_writable (code, jinfo->code_size);
- mono_arch_patch_code (method, domain, code, patch_info, TRUE);
- }
- mono_aot_lock ();
-
- g_free (got_slots);
-
- if (!keep_patches)
- mono_mempool_destroy (mp);
- }
-
- mono_jit_stats.methods_aot++;
-
- if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
- char *full_name = mono_method_full_name (method, TRUE);
-
- if (!jinfo) {
- ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [method_index]];
- jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
- }
-
- mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT FOUND AOT compiled code for %s %p - %p %p\n", full_name, code, code + jinfo->code_size, info);
- g_free (full_name);
- }
-
- aot_module->methods_loaded [method_index / 32] |= 1 << (method_index % 32);
-
- init_plt (aot_module);
-
- return code;
-
- cleanup:
- /* FIXME: The space in domain->mp is wasted */
- if (aot_module->opts & MONO_OPT_SHARED)
- /* No need to cache patches */
- mono_mempool_destroy (mp);
-
- if (jinfo)
- g_free (jinfo);
-
- return NULL;
-}
-
-gpointer
-mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
-{
- gpointer code;
-
- mono_aot_lock ();
- code = mono_aot_get_method_inner (domain, method);
- mono_aot_unlock ();
-
- return code;
-}
-
-static gpointer
-mono_aot_get_method_from_token_inner (MonoDomain *domain, MonoImage *image, guint32 token, MonoClass **klass)
-{
- MonoAssembly *ass = image->assembly;
- MonoMemPool *mp;
- int i, method_index, pindex, got_index, n_patches, used_strings;
- gboolean keep_patches = TRUE;
- guint8 *p;
- MonoDl *module = ass->aot_module;
- guint8 *code = NULL;
- guint8 *info;
- MonoAotModule *aot_module;
-
- *klass = NULL;
-
- if (!module)
- return NULL;
-
- if (mono_profiler_get_events () & MONO_PROFILE_ENTER_LEAVE)
- return NULL;
-
- aot_module = (MonoAotModule*) g_hash_table_lookup (aot_modules, image);
-
- if (domain != mono_get_root_domain ())
- return NULL;
-
- if (aot_module->out_of_date)
- return NULL;
-
- if (aot_module->code_offsets [mono_metadata_token_index (token) - 1] == 0xffffffff) {
- return NULL;
- }
-
- method_index = mono_metadata_token_index (token) - 1;
- code = &aot_module->code [aot_module->code_offsets [method_index]];
- info = &aot_module->method_info [aot_module->method_info_offsets [method_index]];
-
- if (!aot_module->methods_loaded)
- aot_module->methods_loaded = g_new0 (guint32, image->tables [MONO_TABLE_METHOD].rows + 1);
-
- if ((aot_module->methods_loaded [method_index / 32] >> (method_index % 32)) & 0x1)
- return code;
-
- if (mono_last_aot_method != -1) {
- if (mono_jit_stats.methods_aot > mono_last_aot_method)
- return NULL;
- else
- if (mono_jit_stats.methods_aot == mono_last_aot_method) {
- MonoMethod *method = mono_get_method (image, token, NULL);
- printf ("LAST AOT METHOD: %s.%s.%s.\n", method->klass->name_space, method->klass->name, method->name);
- }
- }
-
- p = info;
- *klass = decode_klass_ref (aot_module, p, &p);
-
- if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
- MonoMethod *method = mono_get_method (image, token, NULL);
- char *full_name = mono_method_full_name (method, TRUE);
- mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT FOUND AOT compiled code for %s %p %p\n", full_name, code, info);
- g_free (full_name);
+ code = code2;
}
if (aot_module->opts & MONO_OPT_SHARED)
used_strings = 0;
for (i = 0; i < used_strings; i++) {
- guint string_token = decode_value (p, &p);
- mono_ldstr (mono_get_root_domain (), image, mono_metadata_token_index (string_token));
+ guint token = decode_value (p, &p);
+ mono_ldstr (mono_get_root_domain (), image, mono_metadata_token_index (token));
}
if (aot_module->opts & MONO_OPT_SHARED)
keep_patches = FALSE;
- keep_patches = FALSE;
-
n_patches = decode_value (p, &p);
+ keep_patches = FALSE;
+
if (n_patches) {
MonoJumpInfo *patches;
guint32 *got_slots;
if (patches == NULL)
goto cleanup;
- /* Do this outside the lock to avoid deadlocks */
- mono_aot_unlock ();
-
for (pindex = 0; pindex < n_patches; ++pindex) {
MonoJumpInfo *ji = &patches [pindex];
- if (is_got_patch (ji->type)) {
- if (!aot_module->got [got_slots [pindex]])
- aot_module->got [got_slots [pindex]] = mono_resolve_patch_target (NULL, domain, code, ji, TRUE);
- ji->type = MONO_PATCH_INFO_NONE;
+ if (!aot_module->got [got_slots [pindex]]) {
+ aot_module->got [got_slots [pindex]] = mono_resolve_patch_target (method, domain, code, ji, TRUE);
+ if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
+ register_jump_target_got_slot (domain, ji->data.method, &(aot_module->got [got_slots [pindex]]));
}
+ ji->type = MONO_PATCH_INFO_NONE;
}
- mono_aot_lock ();
-
g_free (got_slots);
if (!keep_patches)
mono_mempool_destroy (mp);
}
+ if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
+ char *full_name;
+
+ if (!method)
+ method = mono_get_method (image, token, NULL);
+
+ full_name = mono_method_full_name (method, TRUE);
+
+ if (!jinfo) {
+ ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [method_index]];
+ jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
+ }
+
+ mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT FOUND AOT compiled code for %s %p - %p %p\n", full_name, code, code + jinfo->code_size, info);
+ g_free (full_name);
+ }
+
+ mono_aot_lock ();
+
mono_jit_stats.methods_aot++;
aot_module->methods_loaded [method_index / 32] |= 1 << (method_index % 32);
init_plt (aot_module);
+ if (method && method->wrapper_type)
+ g_hash_table_insert (aot_module->method_to_code, method, code);
+
+ mono_aot_unlock ();
+
+ if (from_plt && klass && !klass->generic_container)
+ mono_runtime_class_init (mono_class_vtable (domain, klass));
+
return code;
cleanup:
/* No need to cache patches */
mono_mempool_destroy (mp);
+ if (jinfo)
+ g_free (jinfo);
+
return NULL;
}
+static guint32
+find_extra_method_in_amodule (MonoAotModule *amodule, MonoMethod *method)
+{
+ guint32 table_size, entry_size, hash;
+ guint32 *table, *entry;
+ char *full_name = NULL;
+ int num_checks = 0;
+
+ if (!amodule)
+ return 0xffffff;
+
+ table_size = amodule->extra_method_table [0];
+ table = amodule->extra_method_table + 1;
+ entry_size = 3;
+
+ if (method->wrapper_type) {
+ /* FIXME: This is a hack to work around the fact that runtime invoke wrappers get assigned to some random class */
+ if (method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE) {
+ char *tmpsig = mono_signature_get_desc (mono_method_signature (method), TRUE);
+ full_name = g_strdup_printf ("(wrapper runtime-invoke):%s (%s)", method->name, tmpsig);
+ g_free (tmpsig);
+ } else if (method->wrapper_type == MONO_WRAPPER_DELEGATE_INVOKE) {
+ char *tmpsig = mono_signature_get_desc (mono_method_signature (method), TRUE);
+ full_name = g_strdup_printf ("(wrapper delegate-invoke):%s (%s)", method->name, tmpsig);
+ g_free (tmpsig);
+ } else if (method->wrapper_type == MONO_WRAPPER_DELEGATE_BEGIN_INVOKE) {
+ char *tmpsig = mono_signature_get_desc (mono_method_signature (method), TRUE);
+ full_name = g_strdup_printf ("(wrapper delegate-begin-invoke):%s (%s)", method->name, tmpsig);
+ g_free (tmpsig);
+ } else if (method->wrapper_type == MONO_WRAPPER_DELEGATE_END_INVOKE) {
+ char *tmpsig = mono_signature_get_desc (mono_method_signature (method), TRUE);
+ full_name = g_strdup_printf ("(wrapper delegate-end-invoke):%s (%s)", method->name, tmpsig);
+ g_free (tmpsig);
+ } else {
+ full_name = mono_method_full_name (method, TRUE);
+ }
+ }
+
+ hash = mono_aot_method_hash (method) % table_size;
+
+ entry = &table [hash * entry_size];
+
+ if (entry [0] == 0)
+ return 0xffffff;
+
+ while (TRUE) {
+ guint32 key = entry [0];
+ guint32 value = entry [1];
+ guint32 next = entry [entry_size - 1];
+ MonoMethod *m;
+ guint8 *p;
+ int is_wrapper;
+
+ p = amodule->extra_method_info + key;
+ is_wrapper = decode_value (p, &p);
+ if (is_wrapper) {
+ if (full_name && !strcmp (full_name, (char*)p))
+ return value;
+ } else if (can_method_ref_match_method (amodule, p, method)) {
+ num_checks ++;
+ mono_aot_lock ();
+ if (!amodule->method_ref_to_method)
+ amodule->method_ref_to_method = g_hash_table_new (NULL, NULL);
+ m = g_hash_table_lookup (amodule->method_ref_to_method, p);
+ mono_aot_unlock ();
+ if (!m) {
+ guint8 *orig_p = p;
+ m = decode_method_ref_2 (amodule, p, &p);
+ if (m) {
+ mono_aot_lock ();
+ g_hash_table_insert (amodule->method_ref_to_method, orig_p, m);
+ mono_aot_unlock ();
+ }
+ }
+ /*
+ if (m)
+ printf ("%d %s %s\n", num_checks, mono_method_full_name (method, TRUE), mono_method_full_name (m, TRUE));
+ */
+ if (m == method)
+ return value;
+ }
+
+ if (next != 0)
+ entry = &table [next * entry_size];
+ else
+ break;
+ }
+
+ return 0xffffff;
+}
+
+static void
+add_module_cb (gpointer key, gpointer value, gpointer user_data)
+{
+ g_ptr_array_add ((GPtrArray*)user_data, value);
+}
+
+/*
+ * find_extra_method:
+ *
+ * Try finding METHOD in the extra_method table in all AOT images.
+ * Return its method index, or 0xffffff if not found. Set OUT_AMODULE to the AOT
+ * module where the method was found.
+ */
+static guint32
+find_extra_method (MonoMethod *method, MonoAotModule **out_amodule)
+{
+ guint32 index;
+ GPtrArray *modules;
+ int i;
+
+ /* Try the method's module first */
+ *out_amodule = method->klass->image->aot_module;
+ index = find_extra_method_in_amodule (method->klass->image->aot_module, method);
+ if (index != 0xffffff)
+ return index;
+
+ /*
+ * Try all other modules.
+ * This is needed because generic instances klass->image points to the image
+ * containing the generic definition, but the native code is generated to the
+ * AOT image which contains the reference.
+ */
+
+ /* Make a copy to avoid doing the search inside the aot lock */
+ modules = g_ptr_array_new ();
+ mono_aot_lock ();
+ g_hash_table_foreach (aot_modules, add_module_cb, modules);
+ mono_aot_unlock ();
+
+ index = 0xffffff;
+ for (i = 0; i < modules->len; ++i) {
+ MonoAotModule *amodule = g_ptr_array_index (modules, i);
+
+ if (amodule != method->klass->image->aot_module)
+ index = find_extra_method_in_amodule (amodule, method);
+ if (index != 0xffffff) {
+ *out_amodule = amodule;
+ break;
+ }
+ }
+
+ g_ptr_array_free (modules, TRUE);
+
+ return index;
+}
+
+gpointer
+mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
+{
+ MonoClass *klass = method->klass;
+ guint32 method_index;
+ MonoAotModule *amodule = klass->image->aot_module;
+ guint8 *code;
+
+ if (!amodule)
+ return NULL;
+
+ if (amodule->out_of_date)
+ return NULL;
+
+ if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+ (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
+ (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
+ (method->flags & METHOD_ATTRIBUTE_ABSTRACT))
+ return NULL;
+
+ g_assert (klass->inited);
+
+ /* Find method index */
+ if (method->is_inflated && mono_method_is_generic_sharable_impl (method, FALSE)) {
+ method = mono_method_get_declaring_generic_method (method);
+ method_index = mono_metadata_token_index (method->token) - 1;
+ } else if (method->is_inflated || !method->token) {
+ /* This hash table is used to avoid the slower search in the extra_method_table in the AOT image */
+ mono_aot_lock ();
+ code = g_hash_table_lookup (amodule->method_to_code, method);
+ mono_aot_unlock ();
+ if (code)
+ return code;
+
+ method_index = find_extra_method (method, &amodule);
+ if (method_index == 0xffffff) {
+ if (mono_aot_only && mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
+ char *full_name;
+
+ full_name = mono_method_full_name (method, TRUE);
+ mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT NOT FOUND: %s.\n", full_name);
+ g_free (full_name);
+ }
+ return NULL;
+ }
+
+ if (method_index == 0xffffff)
+ return NULL;
+
+ /* Needed by find_jit_info */
+ mono_aot_lock ();
+ if (!amodule->extra_methods)
+ amodule->extra_methods = g_hash_table_new (NULL, NULL);
+ g_hash_table_insert (amodule->extra_methods, GUINT_TO_POINTER (method_index), method);
+ mono_aot_unlock ();
+ } else {
+ /* Common case */
+ method_index = mono_metadata_token_index (method->token) - 1;
+ }
+
+ return load_method (domain, amodule, klass->image, method, method->token, method_index);
+}
+
/**
* Same as mono_aot_get_method, but we try to avoid loading any metadata from the
* method.
gpointer
mono_aot_get_method_from_token (MonoDomain *domain, MonoImage *image, guint32 token)
{
- gpointer res;
- MonoClass *klass;
-
- mono_aot_lock ();
- res = mono_aot_get_method_from_token_inner (domain, image, token, &klass);
- mono_aot_unlock ();
+ MonoAotModule *aot_module = image->aot_module;
+ int method_index;
- if (!res)
+ if (!aot_module)
return NULL;
- if (klass)
- mono_runtime_class_init (mono_class_vtable (domain, klass));
+ method_index = mono_metadata_token_index (token) - 1;
- return res;
+ return load_method (domain, aot_module, image, NULL, token, method_index);
}
typedef struct {
return user_data.module;
}
-/*
- * mono_aot_set_make_unreadable:
- *
- * Set whenever to make all mmaped memory unreadable. In conjuction with a
- * SIGSEGV handler, this is useful to find out which pages the runtime tries to read.
- */
-void
-mono_aot_set_make_unreadable (gboolean unreadable)
-{
- make_unreadable = unreadable;
-}
-
-typedef struct {
- MonoAotModule *module;
- guint8 *ptr;
-} FindMapUserData;
-
-static void
-find_map (gpointer key, gpointer value, gpointer user_data)
-{
- MonoAotModule *module = (MonoAotModule*)value;
- FindMapUserData *data = (FindMapUserData*)user_data;
-
- if (!data->module)
- if ((data->ptr >= module->mem_begin) && (data->ptr < module->mem_end))
- data->module = module;
-}
-
-static MonoAotModule*
-find_module_for_addr (void *ptr)
-{
- FindMapUserData data;
-
- if (!make_unreadable)
- return NULL;
-
- data.module = NULL;
- data.ptr = (guint8*)ptr;
-
- mono_aot_lock ();
- g_hash_table_foreach (aot_modules, (GHFunc)find_map, &data);
- mono_aot_unlock ();
-
- return data.module;
-}
-
-/*
- * mono_aot_is_pagefault:
- *
- * Should be called from a SIGSEGV signal handler to find out whenever @ptr is
- * within memory allocated by this module.
- */
-gboolean
-mono_aot_is_pagefault (void *ptr)
-{
- if (!make_unreadable)
- return FALSE;
-
- return find_module_for_addr (ptr) != NULL;
-}
-
-/*
- * mono_aot_handle_pagefault:
- *
- * Handle a pagefault caused by an unreadable page by making it readable again.
- */
-void
-mono_aot_handle_pagefault (void *ptr)
-{
-#ifndef PLATFORM_WIN32
- guint8* start = (guint8*)ROUND_DOWN (((gssize)ptr), PAGESIZE);
- int res;
-
- mono_aot_lock ();
- res = mprotect (start, PAGESIZE, PROT_READ|PROT_WRITE|PROT_EXEC);
- g_assert (res == 0);
-
- n_pagefaults ++;
- mono_aot_unlock ();
-
-#if 0
- {
- void *array [256];
- char **names;
- int i, size;
-
- printf ("\nNative stacktrace:\n\n");
-
- size = backtrace (array, 256);
- names = backtrace_symbols (array, size);
- for (i =0; i < size; ++i) {
- printf ("\t%s\n", names [i]);
- }
- free (names);
- }
-#endif
-
-#endif
-}
-
/*
* mono_aot_plt_resolve:
*
MonoJumpInfo ji;
MonoAotModule *module = (MonoAotModule*)aot_module;
gboolean res;
+ MonoMemPool *mp;
//printf ("DYN: %p %d\n", aot_module, plt_info_offset);
- p = &module->plt_info [plt_info_offset];
+ p = &module->got_info [plt_info_offset];
ji.type = decode_value (p, &p);
- res = decode_patch_info (module, NULL, &ji, p, &p, NULL);
+ mp = mono_mempool_new_size (512);
+ res = decode_patch (module, mp, &ji, p, &p);
// FIXME: Error handling (how ?)
g_assert (res);
target = mono_resolve_patch_target (NULL, mono_domain_get (), NULL, &ji, TRUE);
+ mono_mempool_destroy (mp);
+
/* Patch the PLT entry with target which might be the actual method not a trampoline */
plt_entry = mono_aot_get_plt_entry (code);
g_assert (plt_entry);
#ifdef MONO_ARCH_AOT_SUPPORTED
#ifdef __i386__
guint8 *buf = info->plt;
-#elif defined(__x86_64__)
- int i, n_entries;
-#elif defined(__arm__)
- int i, n_entries;
+#elif defined(__x86_64__) || defined(__arm__)
+ int i;
#endif
gpointer tramp;
x86_jump_code (buf, tramp);
#elif defined(__x86_64__) || defined(__arm__)
/*
- * Initialize the entries in the plt_jump_table to point to the default targets.
+ * Initialize the PLT entries in the GOT to point to the default targets.
*/
- n_entries = info->plt_jump_table_size / sizeof (gpointer);
/* The first entry points to the AOT trampoline */
- ((gpointer*)info->plt_jump_table)[0] = tramp;
- for (i = 1; i < n_entries; ++i)
+ ((gpointer*)info->got)[info->plt_got_offset_base] = tramp;
+ for (i = 1; i < info->plt_size; ++i)
/* All the default entries point to the first entry */
- ((gpointer*)info->plt_jump_table)[i] = info->plt;
+ ((gpointer*)info->got)[info->plt_got_offset_base + i] = info->plt;
#else
g_assert_not_reached ();
#endif
return ((guint32*)plt_entry) [4];
#else
g_assert_not_reached ();
- return NULL;
+ return 0;
#endif
}
int n_patches, got_index, pindex;
MonoMemPool *mp;
gpointer code;
- MonoAssembly *assembly = amodule->assembly;
/* Load the code */
symbol = g_strdup_printf ("%s", name);
- find_symbol (assembly->aot_module, amodule->globals, symbol, (gpointer *)&code);
+ find_symbol (amodule->sofile, amodule->globals, symbol, (gpointer *)&code);
g_free (symbol);
- g_assert (code);
+ if (!code)
+ g_error ("Symbol '%s' not found in AOT file '%s'.\n", name, amodule->aot_name);
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT FOUND function '%s' in AOT file '%s'.\n", name, amodule->aot_name);
/* Load info */
symbol = g_strdup_printf ("%s_p", name);
- find_symbol (assembly->aot_module, amodule->globals, symbol, (gpointer *)&p);
+ find_symbol (amodule->sofile, amodule->globals, symbol, (gpointer *)&p);
g_free (symbol);
if (!p)
/* Nothing to patch */
MonoJumpInfo *ji = &patches [pindex];
gpointer target;
+ if (amodule->got [got_slots [pindex]])
+ continue;
+
/*
* When this code is executed, the runtime may not yet initalized, so
* resolve the patch info by hand.
#ifdef __x86_64__
} else if (!strcmp (ji->data.name, "mono_amd64_throw_exception")) {
target = mono_amd64_throw_exception;
+#endif
+#ifdef __x86_64__
+ } else if (!strcmp (ji->data.name, "mono_amd64_get_original_ip")) {
+ target = mono_amd64_get_original_ip;
+#endif
+#ifdef __arm__
+ } else if (!strcmp (ji->data.name, "mono_arm_throw_exception")) {
+ target = mono_arm_throw_exception;
+ } else if (!strcmp (ji->data.name, "mono_arm_throw_exception_by_token")) {
+ target = mono_arm_throw_exception_by_token;
#endif
} else if (strstr (ji->data.name, "trampoline_func_") == ji->data.name) {
int tramp_type2 = atoi (ji->data.name + strlen ("trampoline_func_"));
target = (gpointer)mono_get_trampoline_func (tramp_type2);
+ } else if (strstr (ji->data.name, "specific_trampoline_lazy_fetch_") == ji->data.name) {
+ /* atoll is needed because the the offset is unsigned */
+ guint32 slot;
+ int res;
+
+ res = sscanf (ji->data.name, "specific_trampoline_lazy_fetch_%u", &slot);
+ g_assert (res == 1);
+ target = mono_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL);
+ } else if (!strcmp (ji->data.name, "specific_trampoline_monitor_enter")) {
+ target = mono_create_specific_trampoline (NULL, MONO_TRAMPOLINE_MONITOR_ENTER, mono_get_root_domain (), NULL);
+ } else if (!strcmp (ji->data.name, "specific_trampoline_monitor_exit")) {
+ target = mono_create_specific_trampoline (NULL, MONO_TRAMPOLINE_MONITOR_EXIT, mono_get_root_domain (), NULL);
+ } else if (!strcmp (ji->data.name, "specific_trampoline_generic_class_init")) {
+ target = mono_create_specific_trampoline (NULL, MONO_TRAMPOLINE_GENERIC_CLASS_INIT, mono_get_root_domain (), NULL);
+ } else if (!strcmp (ji->data.name, "mono_thread_get_and_clear_pending_exception")) {
+ target = mono_thread_get_and_clear_pending_exception;
} else {
- fprintf (stderr, "%s\n", ji->data.name);
+ fprintf (stderr, "Unknown relocation '%s'\n", ji->data.name);
g_assert_not_reached ();
target = NULL;
}
* domain to be set.
*/
target = mono_resolve_patch_target (NULL, NULL, code, ji, FALSE);
+ g_assert (target);
}
amodule->got [got_slots [pindex]] = target;
mono_aot_get_named_code (const char *name)
{
MonoImage *image;
- MonoAssembly *assembly;
MonoAotModule *amodule;
image = mono_defaults.corlib;
g_assert (image);
- mono_aot_lock ();
-
- assembly = image->assembly;
- g_assert (assembly);
- amodule = (MonoAotModule*) g_hash_table_lookup (aot_modules, image);
+ amodule = image->aot_module;
g_assert (amodule);
- mono_aot_unlock ();
-
return load_named_code (amodule, name);
}
mono_aot_lock ();
- g_assert (image->assembly);
- amodule = (MonoAotModule*) g_hash_table_lookup (aot_modules, image);
+ amodule = image->aot_module;
g_assert (amodule);
if (amodule->trampoline_index == amodule->num_trampolines)
tramp = generic_trampolines [tramp_type];
g_assert (tramp);
- amodule->got [amodule->first_trampoline_got_offset + (index *2)] = tramp;
- amodule->got [amodule->first_trampoline_got_offset + (index *2) + 1] = arg1;
+ amodule->got [amodule->trampoline_got_offset_base + (index *2)] = tramp;
+ amodule->got [amodule->trampoline_got_offset_base + (index *2) + 1] = arg1;
-#ifdef __x86_64__
- tramp_size = 16;
-#elif defined(__arm__)
- tramp_size = 28;
-#else
- tramp_size = -1;
- g_assert_not_reached ();
-#endif
+ tramp_size = amodule->specific_trampoline_size;
code = amodule->trampolines + (index * tramp_size);
if (code_len)
gpointer
mono_aot_get_unbox_trampoline (MonoMethod *method)
{
- MonoClass *klass = method->klass;
guint32 method_index = mono_metadata_token_index (method->token) - 1;
MonoAotModule *amodule;
char *symbol;
gpointer code;
- mono_aot_lock ();
-
- amodule = (MonoAotModule*) g_hash_table_lookup (aot_modules, klass->image);
-
- mono_aot_unlock ();
+ if (method->is_inflated) {
+ guint32 index = find_extra_method (method, &amodule);
- g_assert (amodule);
+ g_assert (index != 0xffffff);
+
+ symbol = g_strdup_printf ("ut_e_%d", index);
+ } else {
+ amodule = method->klass->image->aot_module;
+ g_assert (amodule);
- symbol = g_strdup_printf ("unbox_trampoline_%d", method_index);
+ symbol = g_strdup_printf ("ut_%d", method_index);
+ }
code = load_named_code (amodule, symbol);
g_free (symbol);
return code;
}
-/*
- * mono_aot_get_n_pagefaults:
- *
- * Return the number of times handle_pagefault is called.
- */
-guint32
-mono_aot_get_n_pagefaults (void)
+gpointer
+mono_aot_get_lazy_fetch_trampoline (guint32 slot)
{
- return n_pagefaults;
+ char *symbol;
+ gpointer code;
+
+ symbol = g_strdup_printf ("rgctx_fetch_trampoline_%u", slot);
+ code = load_named_code (mono_defaults.corlib->aot_module, symbol);
+ g_free (symbol);
+ return code;
}
#else
return NULL;
}
-gboolean
-mono_aot_is_pagefault (void *ptr)
-{
- return FALSE;
-}
-
-void
-mono_aot_set_make_unreadable (gboolean unreadable)
-{
-}
-
-guint32
-mono_aot_get_n_pagefaults (void)
-{
- return 0;
-}
-
-void
-mono_aot_handle_pagefault (void *ptr)
-{
-}
-
guint8*
mono_aot_get_plt_entry (guint8 *code)
{
return NULL;
}
+guint32
+mono_aot_get_plt_info_offset (gssize *regs, guint8 *code)
+{
+ g_assert_not_reached ();
+
+ return 0;
+}
+
gpointer
-mono_aot_create_specific_trampolines (gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len)
+mono_aot_create_specific_trampoline (MonoImage *image, gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len)
{
g_assert_not_reached ();
return NULL;
}
gpointer
-mono_aot_get_named_code (char *name)
+mono_aot_get_named_code (const char *name)
{
g_assert_not_reached ();
return NULL;
return NULL;
}
+gpointer
+mono_aot_get_lazy_fetch_trampoline (guint32 slot)
+{
+ g_assert_not_reached ();
+ return NULL;
+}
+
#endif
projects / mono.git / blobdiff