#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/metadata/mono-endian.h>
+#include <mono/utils/mono-logger-internal.h>
#include <mono/utils/mono-mmap.h>
#include "mono/utils/mono-compiler.h"
#include <mono/utils/mono-counters.h>
#define SHARED_EXT ".dll"
#elif ((defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__)) || defined(__MACH__)) && !defined(__linux__)
#define SHARED_EXT ".dylib"
+#elif defined(__APPLE__) && defined(TARGET_X86) && !defined(__native_client_codegen__)
+#define SHARED_EXT ".dylib"
#else
#define SHARED_EXT ".so"
#endif
/* This contains <offset, index> pairs sorted by offset */
/* This is needed because LLVM emitted methods can be in any order */
gint32 *sorted_code_offsets;
+ gint32 sorted_code_offsets_len;
guint32 *method_info_offsets;
guint32 *got_info_offsets;
guint32 *ex_info_offsets;
guint32 *extra_method_table;
guint32 *extra_method_info_offsets;
guint8 *unwind_info;
+ guint8 *thumb_end;
- /* Points to the GNU .eh_frame_hdr section, if it exists */
- guint8 *eh_frame_hdr;
-
- /* Points to the .ARM.exidx section, if it exists */
- guint8 *arm_exidx;
- guint32 arm_exidx_size;
+ /* Points to the mono EH data created by LLVM */
+ guint8 *mono_eh_frame;
/* Points to the trampolines */
guint8 *trampolines [MONO_AOT_TRAMP_NUM];
static gsize aot_code_low_addr = (gssize)-1;
static gsize aot_code_high_addr = 0;
+static GHashTable *aot_jit_icall_hash;
+
static void
init_plt (MonoAotModule *info);
if (amodule->out_of_date)
return NULL;
- assembly = mono_assembly_load (&amodule->image_names [index], NULL, &status);
+ assembly = mono_assembly_load (&amodule->image_names [index], amodule->assembly->basedir, &status);
if (!assembly) {
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is unusable because dependency %s is not found.\n", amodule->aot_name, amodule->image_names [index].name);
amodule->out_of_date = TRUE;
}
static MonoMethod*
-decode_method_ref_2 (MonoAotModule *module, guint8 *buf, guint8 **endbuf);
+decode_resolve_method_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf);
static MonoClass*
decode_klass_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf);
if (is_method) {
MonoMethod *method_def;
g_assert (type == MONO_TYPE_MVAR);
- method_def = decode_method_ref_2 (module, p, &p);
+ method_def = decode_resolve_method_ref (module, p, &p);
if (!method_def)
return NULL;
return mono_class_get_field (klass, token);
}
-/*
- * 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;
-
- /* Keep this in sync with decode_method_ref () */
- value = decode_value (p, &p);
- image_index = value >> 24;
-
- 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_WRAPPER_NAME) {
- 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;
- }
-
- return TRUE;
-}
+/* Stores information returned by decode_method_ref () */
+typedef struct {
+ MonoImage *image;
+ guint32 token;
+ MonoMethod *method;
+ gboolean no_aot_trampoline;
+} MethodRef;
/*
- * decode_method_ref:
+ * decode_method_ref_with_target:
*
- * 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.
+ * Decode a method reference, storing the image/token into a MethodRef structure.
+ * 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 ref->method is set to the method instance.
+ * If TARGET is non-NULL, abort decoding if it can be determined that the decoded method couldn't resolve to TARGET, and return FALSE.
*/
-static MonoImage*
-decode_method_ref (MonoAotModule *module, guint32 *token, MonoMethod **method, gboolean *no_aot_trampoline, guint8 *buf, guint8 **endbuf)
+static gboolean
+decode_method_ref_with_target (MonoAotModule *module, MethodRef *ref, MonoMethod *target, 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;
+ memset (ref, 0, sizeof (MethodRef));
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;
+ ref->no_aot_trampoline = TRUE;
value = decode_value (p, &p);
image_index = value >> 24;
}
+ if (image_index < MONO_AOT_METHODREF_MIN || image_index == MONO_AOT_METHODREF_METHODSPEC || image_index == MONO_AOT_METHODREF_GINST) {
+ if (target && target->wrapper_type)
+ return FALSE;
+ }
+
if (image_index == MONO_AOT_METHODREF_WRAPPER) {
guint32 wrapper_type;
wrapper_type = decode_value (p, &p);
+ if (target && target->wrapper_type != wrapper_type)
+ return FALSE;
+
/* 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);
+ MonoMethod *m = decode_resolve_method_ref (module, p, &p);
if (!m)
- return NULL;
+ return FALSE;
mono_class_init (m->klass);
- *method = mono_marshal_get_remoting_invoke_with_check (m);
+ ref->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);
+ return FALSE;
+ ref->method = mono_marshal_get_proxy_cancast (klass);
break;
}
case MONO_WRAPPER_LDFLD:
case MONO_WRAPPER_ISINST: {
MonoClass *klass = decode_klass_ref (module, p, &p);
if (!klass)
- return NULL;
+ return FALSE;
if (wrapper_type == MONO_WRAPPER_LDFLD)
- *method = mono_marshal_get_ldfld_wrapper (&klass->byval_arg);
+ ref->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);
+ ref->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);
+ ref->method = mono_marshal_get_stfld_wrapper (&klass->byval_arg);
else if (wrapper_type == MONO_WRAPPER_ISINST)
- *method = mono_marshal_get_isinst (klass);
+ ref->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);
+ ref->method = mono_marshal_get_ldfld_remote_wrapper (NULL);
break;
case MONO_WRAPPER_STFLD_REMOTE:
- *method = mono_marshal_get_stfld_remote_wrapper (NULL);
+ ref->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);
+ ref->method = mono_gc_get_managed_allocator_by_type (atype);
break;
}
case MONO_WRAPPER_WRITE_BARRIER:
- *method = mono_gc_get_write_barrier ();
+ ref->method = mono_gc_get_write_barrier ();
break;
case MONO_WRAPPER_STELEMREF:
- *method = mono_marshal_get_stelemref ();
+ ref->method = mono_marshal_get_stelemref ();
break;
case MONO_WRAPPER_SYNCHRONIZED: {
- MonoMethod *m = decode_method_ref_2 (module, p, &p);
+ MonoMethod *m = decode_resolve_method_ref (module, p, &p);
if (!m)
- return NULL;
- *method = mono_marshal_get_synchronized_wrapper (m);
+ return FALSE;
+ ref->method = mono_marshal_get_synchronized_wrapper (m);
break;
}
case MONO_WRAPPER_UNKNOWN: {
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);
+ if (subtype == MONO_AOT_WRAPPER_PTR_TO_STRUCTURE || subtype == MONO_AOT_WRAPPER_STRUCTURE_TO_PTR) {
+ MonoClass *klass = decode_klass_ref (module, p, &p);
+
+ if (!klass)
+ return FALSE;
+
+ g_assert (target);
+ if (klass != target->klass)
+ return FALSE;
+
+ if (subtype == MONO_AOT_WRAPPER_PTR_TO_STRUCTURE) {
+ if (strcmp (target->name, "PtrToStructure"))
+ return FALSE;
+ ref->method = mono_marshal_get_ptr_to_struct (klass);
+ } else {
+ if (strcmp (target->name, "StructureToPtr"))
+ return FALSE;
+ ref->method = mono_marshal_get_struct_to_ptr (klass);
+ }
+ } else {
+ 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);
+ ref->method = mono_monitor_get_fast_path (orig_method);
+ }
break;
}
case MONO_WRAPPER_RUNTIME_INVOKE: {
/* Direct wrapper */
- MonoMethod *m = decode_method_ref_2 (module, p, &p);
+ MonoMethod *m = decode_resolve_method_ref (module, p, &p);
if (!m)
- return NULL;
- *method = mono_marshal_get_runtime_invoke (m, FALSE);
+ return FALSE;
+ ref->method = mono_marshal_get_runtime_invoke (m, FALSE);
break;
}
case MONO_WRAPPER_MANAGED_TO_MANAGED: {
int rank = decode_value (p, &p);
int elem_size = decode_value (p, &p);
- *method = mono_marshal_get_array_address (rank, elem_size);
+ ref->method = mono_marshal_get_array_address (rank, elem_size);
} else {
g_assert_not_reached ();
}
break;
}
+ case MONO_WRAPPER_MANAGED_TO_NATIVE: {
+ MonoMethod *m = decode_resolve_method_ref (module, p, &p);
+
+ if (!m)
+ return FALSE;
+
+ /* This should only happen when looking for an extra method */
+ g_assert (target);
+ if (mono_marshal_method_from_wrapper (target) == m)
+ ref->method = target;
+ else
+ return FALSE;
+ break;
+ }
default:
g_assert_not_reached ();
}
} else if (image_index == MONO_AOT_METHODREF_WRAPPER_NAME) {
+ if (target)
+ return FALSE;
/* 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);
+ ref->token = decode_value (p, &p);
image = load_image (module, image_index, TRUE);
if (!image)
- return NULL;
+ return FALSE;
} else if (image_index == MONO_AOT_METHODREF_GINST) {
MonoClass *klass;
MonoGenericContext ctx;
*/
klass = decode_klass_ref (module, p, &p);
if (!klass)
- return NULL;
+ return FALSE;
+
+ if (target && target->klass != klass)
+ return FALSE;
image_index = decode_value (p, &p);
- *token = decode_value (p, &p);
+ ref->token = decode_value (p, &p);
image = load_image (module, image_index, TRUE);
if (!image)
- return NULL;
+ return FALSE;
- *method = mono_get_method_full (image, *token, NULL, NULL);
- if (!(*method))
- return NULL;
+ ref->method = mono_get_method_full (image, ref->token, NULL, NULL);
+ if (!ref->method)
+ return FALSE;
memset (&ctx, 0, sizeof (ctx));
ctx.class_inst = klass->generic_class->context.class_inst;
ctx.method_inst = NULL;
- *method = mono_class_inflate_generic_method_full (*method, klass, &ctx);
+ ref->method = mono_class_inflate_generic_method_full (ref->method, klass, &ctx);
}
memset (&ctx, 0, sizeof (ctx));
if (!decode_generic_context (module, &ctx, p, &p))
- return NULL;
+ return FALSE;
- *method = mono_class_inflate_generic_method_full (*method, klass, &ctx);
+ ref->method = mono_class_inflate_generic_method_full (ref->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;
+ return FALSE;
method_type = decode_value (p, &p);
- *token = 0;
switch (method_type) {
case 0:
- *method = mono_class_get_method_from_name (klass, ".ctor", klass->rank);
+ ref->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);
+ ref->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);
+ ref->method = mono_class_get_method_from_name (klass, "Get", -1);
break;
case 3:
- *method = mono_class_get_method_from_name (klass, "Address", -1);
+ ref->method = mono_class_get_method_from_name (klass, "Address", -1);
break;
case 4:
- *method = mono_class_get_method_from_name (klass, "Set", -1);
+ ref->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);
+ ref->token = MONO_TOKEN_METHOD_DEF | (value & 0xffffff);
image = load_image (module, image_index, TRUE);
if (!image)
- return NULL;
+ return FALSE;
}
*endbuf = p;
- return image;
+ ref->image = image;
+
+ return TRUE;
+}
+
+static gboolean
+decode_method_ref (MonoAotModule *module, MethodRef *ref, guint8 *buf, guint8 **endbuf)
+{
+ return decode_method_ref_with_target (module, ref, NULL, buf, endbuf);
}
/*
- * decode_method_ref_2:
+ * decode_resolve_method_ref_with_target:
*
* Similar to decode_method_ref, but resolve and return the method itself.
*/
static MonoMethod*
-decode_method_ref_2 (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
+decode_resolve_method_ref_with_target (MonoAotModule *module, MonoMethod *target, guint8 *buf, guint8 **endbuf)
{
- MonoMethod *method;
- guint32 token;
- MonoImage *image = decode_method_ref (module, &token, &method, NULL, buf, endbuf);
+ MethodRef ref;
+ gboolean res;
- if (method)
- return method;
- if (!image)
+ res = decode_method_ref_with_target (module, &ref, target, buf, endbuf);
+ if (!res)
+ return NULL;
+ if (ref.method)
+ return ref.method;
+ if (!ref.image)
return NULL;
- method = mono_get_method (image, token, NULL);
- return method;
+ return mono_get_method (ref.image, ref.token, NULL);
}
-G_GNUC_UNUSED
-static void
-make_writable (guint8* addr, guint32 len)
+static MonoMethod*
+decode_resolve_method_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
{
- guint8 *page_start;
- int pages, err;
-
- if (mono_aot_only)
- g_error ("Attempt to make AOT memory writable while running in aot-only mode.\n");
-
- page_start = (guint8 *) (((gssize) (addr)) & ~ (mono_pagesize () - 1));
- pages = (addr + len - page_start + mono_pagesize () - 1) / mono_pagesize ();
-
- err = mono_mprotect (page_start, pages * mono_pagesize (), MONO_MMAP_READ | MONO_MMAP_WRITE | MONO_MMAP_EXEC);
- g_assert (err == 0);
+ return decode_resolve_method_ref_with_target (module, NULL, buf, endbuf);
}
static void
else
*value = NULL;
} else {
- mono_dl_symbol (module, name, value);
+ char *err = mono_dl_symbol (module, name, value);
+
+ if (err)
+ g_free (err);
}
}
-#ifndef SHT_ARM_EXIDX
-#define SHT_ARM_EXIDX 0x70000001
+static gboolean
+check_usable (MonoAssembly *assembly, MonoAotFileInfo *info, char **out_msg)
+{
+ char *build_info;
+ char *msg = NULL;
+ gboolean usable = TRUE;
+ gboolean full_aot;
+ guint8 *blob;
+
+ if (strcmp (assembly->image->guid, info->assembly_guid)) {
+ msg = g_strdup_printf ("doesn't match assembly");
+ usable = FALSE;
+ }
+
+ build_info = mono_get_runtime_build_info ();
+ if (strlen (info->runtime_version) > 0 && strcmp (info->runtime_version, build_info)) {
+ msg = g_strdup_printf ("compiled against runtime version '%s' while this runtime has version '%s'", info->runtime_version, build_info);
+ usable = FALSE;
+ }
+ g_free (build_info);
+
+ full_aot = info->flags & MONO_AOT_FILE_FLAG_FULL_AOT;
+
+ if (mono_aot_only && !full_aot) {
+ msg = g_strdup_printf ("not compiled with --aot=full");
+ usable = FALSE;
+ }
+ if (!mono_aot_only && full_aot) {
+ msg = g_strdup_printf ("compiled with --aot=full");
+ usable = FALSE;
+ }
+#ifdef TARGET_ARM
+ /* mono_arch_find_imt_method () requires this */
+ if ((info->flags & MONO_AOT_FILE_FLAG_WITH_LLVM) && !mono_use_llvm) {
+ msg = g_strdup_printf ("compiled against LLVM");
+ usable = FALSE;
+ }
#endif
+ if (mini_get_debug_options ()->mdb_optimizations && !(info->flags & MONO_AOT_FILE_FLAG_DEBUG) && !full_aot) {
+ msg = g_strdup_printf ("not compiled for debugging");
+ usable = FALSE;
+ }
-#ifdef HAVE_DL_ITERATE_PHDR
-static int
-dl_callback (struct dl_phdr_info *info, size_t size, void *data)
-{
- int j;
- MonoAotModule *amodule = data;
-
- if (!strcmp (amodule->aot_name, info->dlpi_name)) {
- for (j = 0; j < info->dlpi_phnum; j++) {
- if (info->dlpi_phdr [j].p_type == PT_GNU_EH_FRAME)
- amodule->eh_frame_hdr = (guint8*)(info->dlpi_addr + info->dlpi_phdr [j].p_vaddr);
- if (info->dlpi_phdr [j].p_type == SHT_ARM_EXIDX) {
- amodule->arm_exidx = (guint8*)(info->dlpi_addr + info->dlpi_phdr [j].p_vaddr);
- amodule->arm_exidx_size = info->dlpi_phdr [j].p_filesz;
- }
+ blob = info->blob;
+
+ if (info->gc_name_index != -1) {
+ char *gc_name = (char*)&blob [info->gc_name_index];
+ const char *current_gc_name = mono_gc_get_gc_name ();
+
+ if (strcmp (current_gc_name, gc_name) != 0) {
+ msg = g_strdup_printf ("compiled against GC %s, while the current runtime uses GC %s.\n", gc_name, current_gc_name);
+ usable = FALSE;
}
- return 1;
- } else {
- return 0;
}
+
+ *out_msg = msg;
+ return usable;
}
-#endif
static void
load_aot_module (MonoAssembly *assembly, gpointer user_data)
MonoAotModule *amodule;
MonoDl *sofile;
gboolean usable = TRUE;
- char *saved_guid = NULL;
- char *aot_version = NULL;
- char *runtime_version, *build_info;
- char *opt_flags = NULL;
+ char *version_symbol = NULL;
+ char *msg = NULL;
gpointer *globals;
- gboolean full_aot = FALSE;
- MonoAotFileInfo *file_info = NULL;
- int i;
- gpointer *got_addr;
+ MonoAotFileInfo *info = NULL;
+ int i, version;
+ guint8 *blob;
+ gboolean do_load_image = TRUE;
if (mono_compile_aot)
return;
return;
}
- 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);
- find_symbol (sofile, globals, "mono_runtime_version", (gpointer *)&runtime_version);
- find_symbol (sofile, globals, "mono_aot_got_addr", (gpointer *)&got_addr);
-
- if (!aot_version || strcmp (aot_version, MONO_AOT_FILE_VERSION)) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s has wrong file format version (expected %s got %s)\n", aot_name, MONO_AOT_FILE_VERSION, aot_version);
- usable = FALSE;
- }
- else {
- if (!saved_guid || strcmp (assembly->image->guid, saved_guid)) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is out of date.\n", aot_name);
- usable = FALSE;
- }
- }
-
- 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);
+ find_symbol (sofile, globals, "mono_aot_version", (gpointer *) &version_symbol);
+ find_symbol (sofile, globals, "mono_aot_file_info", (gpointer*)&info);
- find_symbol (sofile, globals, "mono_aot_file_info", (gpointer*)&file_info);
- g_assert (file_info);
-
- full_aot = ((MonoAotFileInfo*)file_info)->flags & MONO_AOT_FILE_FLAG_FULL_AOT;
-
- if (mono_aot_only && !full_aot) {
- fprintf (stderr, "Can't use AOT image '%s' in aot-only mode because it is not compiled with --aot=full.\n", aot_name);
- exit (1);
- }
- if (!mono_aot_only && full_aot) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is compiled with --aot=full.\n", aot_name);
- usable = FALSE;
+ if (version_symbol) {
+ /* Old file format */
+ version = atoi (version_symbol);
+ } else {
+ g_assert (info);
+ version = info->version;
}
- if ((((MonoAotFileInfo*)file_info)->flags & MONO_AOT_FILE_FLAG_WITH_LLVM) && !mono_use_llvm) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is compiled with LLVM.\n", aot_name);
+ if (version != MONO_AOT_FILE_VERSION) {
+ msg = g_strdup_printf ("wrong file format version (expected %d got %d)", MONO_AOT_FILE_VERSION, version);
usable = FALSE;
+ } else {
+ usable = check_usable (assembly, info, &msg);
}
if (!usable) {
if (mono_aot_only) {
- fprintf (stderr, "Failed to load AOT module '%s' while running in aot-only mode.\n", aot_name);
+ fprintf (stderr, "Failed to load AOT module '%s' while running in aot-only mode: %s.\n", aot_name, msg);
exit (1);
+ } else {
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is unusable: %s.\n", aot_name, msg);
}
+ g_free (msg);
g_free (aot_name);
if (sofile)
mono_dl_close (sofile);
return;
}
+ blob = info->blob;
+
amodule = g_new0 (MonoAotModule, 1);
amodule->aot_name = aot_name;
amodule->assembly = assembly;
- memcpy (&amodule->info, file_info, sizeof (*file_info));
+ memcpy (&amodule->info, info, sizeof (*info));
- amodule->got = *got_addr;
+ amodule->got = amodule->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);
+ amodule->blob = blob;
/* Read image table */
{
guint32 table_len, i;
char *table = NULL;
- find_symbol (sofile, globals, "mono_image_table", (gpointer *)&table);
+ table = info->image_table;
g_assert (table);
table_len = *(guint32*)table;
}
}
- /* Read method and method_info tables */
- find_symbol (sofile, globals, "code_offsets", (gpointer*)&amodule->code_offsets);
- find_symbol (sofile, globals, "methods", (gpointer*)&amodule->code);
- find_symbol (sofile, globals, "methods_end", (gpointer*)&amodule->code_end);
- find_symbol (sofile, globals, "method_info_offsets", (gpointer*)&amodule->method_info_offsets);
- find_symbol (sofile, globals, "ex_info_offsets", (gpointer*)&amodule->ex_info_offsets);
- find_symbol (sofile, globals, "blob", (gpointer*)&amodule->blob);
- 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_offsets", (gpointer *)&amodule->extra_method_info_offsets);
- find_symbol (sofile, globals, "got_info_offsets", (gpointer*)&amodule->got_info_offsets);
- find_symbol (sofile, globals, "specific_trampolines", (gpointer*)&(amodule->trampolines [MONO_AOT_TRAMP_SPECIFIC]));
- find_symbol (sofile, globals, "static_rgctx_trampolines", (gpointer*)&(amodule->trampolines [MONO_AOT_TRAMP_STATIC_RGCTX]));
- find_symbol (sofile, globals, "imt_thunks", (gpointer*)&(amodule->trampolines [MONO_AOT_TRAMP_IMT_THUNK]));
- find_symbol (sofile, globals, "unwind_info", (gpointer)&amodule->unwind_info);
- find_symbol (sofile, globals, "mem_end", (gpointer*)&amodule->mem_end);
-
+ amodule->code_offsets = info->code_offsets;
+ amodule->code = info->methods;
+#ifdef TARGET_ARM
+ /* Mask out thumb interop bit */
+ amodule->code = (void*)((mgreg_t)amodule->code & ~1);
+#endif
+ amodule->code_end = info->methods_end;
+ amodule->method_info_offsets = info->method_info_offsets;
+ amodule->ex_info_offsets = info->ex_info_offsets;
+ amodule->class_info_offsets = info->class_info_offsets;
+ amodule->class_name_table = info->class_name_table;
+ amodule->extra_method_table = info->extra_method_table;
+ amodule->extra_method_info_offsets = info->extra_method_info_offsets;
+ amodule->got_info_offsets = info->got_info_offsets;
+ amodule->unwind_info = info->unwind_info;
+ amodule->mem_end = info->mem_end;
amodule->mem_begin = amodule->code;
-
- find_symbol (sofile, globals, "plt", (gpointer*)&amodule->plt);
- find_symbol (sofile, globals, "plt_end", (gpointer*)&amodule->plt_end);
+ amodule->plt = info->plt;
+ amodule->plt_end = info->plt_end;
+ amodule->mono_eh_frame = info->mono_eh_frame;
+ amodule->trampolines [MONO_AOT_TRAMP_SPECIFIC] = info->specific_trampolines;
+ amodule->trampolines [MONO_AOT_TRAMP_STATIC_RGCTX] = info->static_rgctx_trampolines;
+ amodule->trampolines [MONO_AOT_TRAMP_IMT_THUNK] = info->imt_thunks;
+ amodule->thumb_end = info->thumb_end;
if (make_unreadable) {
#ifndef TARGET_WIN32
mono_jit_info_add_aot_module (assembly->image, amodule->code, amodule->code_end);
assembly->image->aot_module = amodule;
-
-#ifdef HAVE_DL_ITERATE_PHDR
- /* Lookup the address of the .eh_frame_hdr () section if available */
- dl_iterate_phdr (dl_callback, amodule);
-#endif
if (mono_aot_only) {
if (mono_defaults.corlib) {
}
}
+ if (mono_gc_is_moving ()) {
+ MonoJumpInfo ji;
+
+ memset (&ji, 0, sizeof (ji));
+ ji.type = MONO_PATCH_INFO_GC_CARD_TABLE_ADDR;
+
+ amodule->got [2] = mono_resolve_patch_target (NULL, mono_get_root_domain (), NULL, &ji, FALSE);
+ }
+
/*
* 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.
* non-lazily, since we can't handle out-of-date errors later.
* The cached class info also depends on the exact assemblies.
*/
- for (i = 0; i < amodule->image_table_len; ++i)
- load_image (amodule, i, FALSE);
+#if defined(__native_client__)
+ /* TODO: Don't 'load_image' on mscorlib due to a */
+ /* recursive loading problem. This should be */
+ /* removed if mscorlib is loaded from disk. */
+ if (strncmp(assembly->aname.name, "mscorlib", 8)) {
+ do_load_image = TRUE;
+ } else {
+ do_load_image = FALSE;
+ }
+#endif
+ if (do_load_image) {
+ for (i = 0; i < amodule->image_table_len; ++i)
+ load_image (amodule, i, FALSE);
+ }
if (amodule->out_of_date) {
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT Module %s is unusable because a dependency is out-of-date.\n", assembly->image->name);
use_aot_cache = TRUE;
}
+void
+mono_aot_cleanup (void)
+{
+ if (aot_jit_icall_hash)
+ g_hash_table_destroy (aot_jit_icall_hash);
+ if (aot_modules)
+ g_hash_table_destroy (aot_modules);
+}
+
static gboolean
decode_cached_class_info (MonoAotModule *module, MonoCachedClassInfo *info, guint8 *buf, guint8 **endbuf)
{
guint32 flags;
+ MethodRef ref;
+ gboolean res;
info->vtable_size = decode_value (buf, &buf);
if (info->vtable_size == -1)
info->is_generic_container = (flags >> 8) & 0x1;
if (info->has_cctor) {
- MonoImage *cctor_image = decode_method_ref (module, &info->cctor_token, NULL, NULL, buf, &buf);
- if (!cctor_image)
+ res = decode_method_ref (module, &ref, buf, &buf);
+ if (!res)
return FALSE;
+ info->cctor_token = ref.token;
}
if (info->has_finalize) {
- info->finalize_image = decode_method_ref (module, &info->finalize_token, NULL, NULL, buf, &buf);
- if (!info->finalize_image)
+ res = decode_method_ref (module, &ref, buf, &buf);
+ if (!res)
return FALSE;
+ info->finalize_image = ref.image;
+ info->finalize_token = ref.token;
}
info->instance_size = decode_value (buf, &buf);
{
int i;
MonoClass *klass = vtable->klass;
- MonoAotModule *aot_module = klass->image->aot_module;
+ MonoAotModule *amodule = klass->image->aot_module;
guint8 *info, *p;
MonoCachedClassInfo class_info;
gboolean err;
- guint32 token;
- MonoImage *image;
- gboolean no_aot_trampoline;
+ MethodRef ref;
+ gboolean res;
- if (MONO_CLASS_IS_INTERFACE (klass) || klass->rank || !aot_module)
+ if (MONO_CLASS_IS_INTERFACE (klass) || klass->rank || !amodule)
return NULL;
- info = &aot_module->blob [mono_aot_get_offset (aot_module->class_info_offsets, mono_metadata_token_index (klass->type_token) - 1)];
+ info = &amodule->blob [mono_aot_get_offset (amodule->class_info_offsets, mono_metadata_token_index (klass->type_token) - 1)];
p = info;
- err = decode_cached_class_info (aot_module, &class_info, p, &p);
+ err = decode_cached_class_info (amodule, &class_info, p, &p);
if (!err)
return NULL;
for (i = 0; i < slot; ++i)
- decode_method_ref (aot_module, &token, NULL, NULL, p, &p);
+ decode_method_ref (amodule, &ref, p, &p);
- image = decode_method_ref (aot_module, &token, NULL, &no_aot_trampoline, p, &p);
- if (!image)
+ res = decode_method_ref (amodule, &ref, p, &p);
+ if (!res)
return NULL;
- if (no_aot_trampoline)
+ if (ref.no_aot_trampoline)
return NULL;
- if (mono_metadata_token_index (token) == 0)
+ if (mono_metadata_token_index (ref.token) == 0)
return NULL;
- return mono_aot_get_method_from_token (domain, image, token);
+ return mono_aot_get_method_from_token (domain, ref.image, ref.token);
}
gboolean
mono_aot_get_cached_class_info (MonoClass *klass, MonoCachedClassInfo *res)
{
- MonoAotModule *aot_module = klass->image->aot_module;
+ MonoAotModule *amodule = klass->image->aot_module;
guint8 *p;
gboolean err;
- if (klass->rank || !aot_module)
+ if (klass->rank || !amodule)
return FALSE;
- p = (guint8*)&aot_module->blob [mono_aot_get_offset (aot_module->class_info_offsets, mono_metadata_token_index (klass->type_token) - 1)];
+ p = (guint8*)&amodule->blob [mono_aot_get_offset (amodule->class_info_offsets, mono_metadata_token_index (klass->type_token) - 1)];
- err = decode_cached_class_info (aot_module, res, p, &p);
+ err = decode_cached_class_info (amodule, res, p, &p);
if (!err)
return FALSE;
gboolean
mono_aot_get_class_from_name (MonoImage *image, const char *name_space, const char *name, MonoClass **klass)
{
- MonoAotModule *aot_module = image->aot_module;
+ MonoAotModule *amodule = image->aot_module;
guint16 *table, *entry;
guint16 table_size;
guint32 hash;
guint32 cols [MONO_TYPEDEF_SIZE];
GHashTable *nspace_table;
- if (!aot_module || !aot_module->class_name_table)
+ if (!amodule || !amodule->class_name_table)
return FALSE;
mono_aot_lock ();
*klass = NULL;
/* First look in the cache */
- if (!aot_module->name_cache)
- aot_module->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
- nspace_table = g_hash_table_lookup (aot_module->name_cache, name_space);
+ if (!amodule->name_cache)
+ amodule->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
+ nspace_table = g_hash_table_lookup (amodule->name_cache, name_space);
if (nspace_table) {
*klass = g_hash_table_lookup (nspace_table, name);
if (*klass) {
}
}
- table_size = aot_module->class_name_table [0];
- table = aot_module->class_name_table + 1;
+ table_size = amodule->class_name_table [0];
+ table = amodule->class_name_table + 1;
if (name_space [0] == '\0')
full_name = g_strdup_printf ("%s", name);
/* Add to cache */
if (*klass) {
mono_aot_lock ();
- nspace_table = g_hash_table_lookup (aot_module->name_cache, name_space);
+ nspace_table = g_hash_table_lookup (amodule->name_cache, name_space);
if (!nspace_table) {
nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
- g_hash_table_insert (aot_module->name_cache, (char*)name_space2, nspace_table);
+ g_hash_table_insert (amodule->name_cache, (char*)name_space2, nspace_table);
}
g_hash_table_insert (nspace_table, (char*)name2, *klass);
mono_aot_unlock ();
return TRUE;
}
-#define DW_EH_PE_omit 0xff
-#define DW_EH_PE_uleb128 0x01
-#define DW_EH_PE_udata2 0x02
-#define DW_EH_PE_udata4 0x03
-#define DW_EH_PE_udata8 0x04
-#define DW_EH_PE_sleb128 0x09
-#define DW_EH_PE_sdata2 0x0A
-#define DW_EH_PE_sdata4 0x0B
-#define DW_EH_PE_sdata8 0x0C
-
-#define DW_EH_PE_absptr 0x00
-#define DW_EH_PE_pcrel 0x10
-#define DW_EH_PE_datarel 0x30
-#define DW_EH_PE_omit 0xff
-
-typedef struct
-{
- guint8 version;
- guint8 eh_frame_ptr_enc;
- guint8 fde_count_enc;
- guint8 table_enc;
- guint8 rest;
-} eh_frame_hdr;
-
/*
- * decode_eh_frame:
+ * decode_mono_eh_frame:
*
- * Decode the exception handling information in the .eh_frame section of the AOT
- * file belong to CODE, and construct a MonoJitInfo structure from it.
+ * Decode the EH information emitted by our modified LLVM compiler and construct a
+ * MonoJitInfo structure from it.
* LOCKING: Acquires the domain lock.
*/
-static G_GNUC_UNUSED void
-decode_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
- MonoMethod *method, guint8 *code, MonoJitInfo *jinfo)
+static MonoJitInfo*
+decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
+ MonoMethod *method, guint8 *code,
+ MonoJitExceptionInfo *clauses, int num_clauses,
+ int extra_size, GSList **nesting,
+ int *this_reg, int *this_offset)
{
- eh_frame_hdr *hdr;
guint8 *p;
- guint8 *eh_frame, *unwind_info;
- guint32 eh_frame_ptr;
- int fde_count;
+ guint8 *fde, *cie, *code_start, *code_end;
+ int version, fde_count;
gint32 *table;
- int i, pos, left, right, offset, offset1, offset2;
- guint32 unw_len, code_len;
+ int i, j, pos, left, right, offset, offset1, offset2, code_len;
MonoJitExceptionInfo *ei;
- guint32 ei_len;
+ guint32 fde_len, ei_len, nested_len, nindex;
+ gpointer *type_info;
+ MonoJitInfo *jinfo;
+ MonoLLVMFDEInfo info;
- g_assert (amodule->eh_frame_hdr);
+ g_assert (amodule->mono_eh_frame);
- // http://refspecs.freestandards.org/LSB_1.3.0/gLSB/gLSB/ehframehdr.html
- hdr = (eh_frame_hdr*)amodule->eh_frame_hdr;
- g_assert (hdr->version == 1);
- g_assert (hdr->eh_frame_ptr_enc == (DW_EH_PE_pcrel | DW_EH_PE_sdata4));
- g_assert (hdr->fde_count_enc == DW_EH_PE_udata4);
- g_assert (hdr->table_enc == (DW_EH_PE_datarel | DW_EH_PE_sdata4));
+ p = amodule->mono_eh_frame;
+
+ /* p points to data emitted by LLVM in DwarfException::EmitMonoEHFrame () */
+
+ /* Header */
+ version = *p;
+ g_assert (version == 1);
+ p ++;
+ p = ALIGN_PTR_TO (p, 4);
- p = &(hdr->rest);
- eh_frame_ptr = *(guint32*)p;
- p += 4;
fde_count = *(guint32*)p;
p += 4;
table = (gint32*)p;
+ /* There is +1 entry in the table */
+ cie = p + ((fde_count + 1) * 8);
+
/* Binary search in the table to find the entry for code */
- offset = code - amodule->eh_frame_hdr;
+ offset = code - amodule->mono_eh_frame;
left = 0;
right = fde_count;
break;
}
- g_assert (code >= amodule->eh_frame_hdr + table [(pos * 2)]);
- if (pos < fde_count)
- g_assert (code < amodule->eh_frame_hdr + table [(pos * 2) + 2]);
-
- eh_frame = amodule->eh_frame_hdr + table [(pos * 2) + 1];
-
- unwind_info = mono_unwind_decode_fde (eh_frame, &unw_len, &code_len, &ei, &ei_len, NULL);
-
- jinfo->code_size = code_len;
- jinfo->used_regs = mono_cache_unwind_info (unwind_info, unw_len);
- jinfo->method = method;
- jinfo->code_start = code;
- jinfo->domain_neutral = 0;
- /* This signals that used_regs points to a normal cached unwind info */
- jinfo->from_aot = 0;
-
- g_assert (ei_len == jinfo->num_clauses);
- for (i = 0; i < jinfo->num_clauses; ++i) {
- MonoJitExceptionInfo *jei = &jinfo->clauses [i];
-
- jei->try_start = ei [i].try_start;
- jei->try_end = ei [i].try_end;
- jei->handler_start = ei [i].handler_start;
- }
-}
-
-#ifdef TARGET_ARM
-
-/* The offsets in the table are 31 bits long, have to extend them to 32 */
-#define EXTEND_PREL31(val) ((((gint32)(val)) << 1) >> 1)
+ code_start = amodule->mono_eh_frame + table [(pos * 2)];
+ /* This won't overflow because there is +1 entry in the table */
+ code_end = amodule->mono_eh_frame + table [(pos * 2) + 2];
+ code_len = code_end - code_start;
-static inline guint32
-decode_uleb128 (guint8 *buf, guint8 **endbuf)
-{
- guint8 *p = buf;
- guint32 res = 0;
- int shift = 0;
+ g_assert (code >= code_start && code < code_end);
- while (TRUE) {
- guint8 b = *p;
- p ++;
+ fde = amodule->mono_eh_frame + table [(pos * 2) + 1];
+ /* This won't overflow because there is +1 entry in the table */
+ fde_len = table [(pos * 2) + 2 + 1] - table [(pos * 2) + 1];
- res = res | (((int)(b & 0x7f)) << shift);
- if (!(b & 0x80))
- break;
- shift += 7;
- }
-
- *endbuf = p;
+ mono_unwind_decode_llvm_mono_fde (fde, fde_len, cie, code_start, &info);
+ ei = info.ex_info;
+ ei_len = info.ex_info_len;
+ type_info = info.type_info;
+ *this_reg = info.this_reg;
+ *this_offset = info.this_offset;
- return res;
-}
+ /* Count number of nested clauses */
+ nested_len = 0;
+ for (i = 0; i < ei_len; ++i) {
+ /* This might be unaligned */
+ gint32 cindex1 = read32 (type_info [i]);
+ GSList *l;
-static GSList*
-decode_arm_eh_ops (guint8 *unwind_ops, int nops)
-{
- int i, vsp_reg, vsp_offset;
- GSList *ops;
- gint32 *reg_offsets;
+ for (l = nesting [cindex1]; l; l = l->next) {
+ gint32 nesting_cindex = GPOINTER_TO_INT (l->data);
- /*
- * Have to convert the ARM unwind info into DWARF unwind info.
- * The ARM unwind info specifies a simple set of instructions which need to be
- * executed during unwinding. It manipulates a virtual stack pointer (vsp). The
- * connection with DWARF unwind info is the following: after all ARM unwind
- * opcodes have been executed, the stack should be completely unwound, i.e.
- * vsp == DWARF CFA. This allows us to construct the DWARF opcodes corresponding
- * to the ARM opcodes.
- * The ARM unwind info is not instruction precise, i. e. it can't handle
- * async exceptions etc.
- */
- /* The reg used to compute the initial value of vsp */
- vsp_reg = ARMREG_SP;
- /* The offset between vsp_reg and the CFA */
- vsp_offset = 0;
-
- /* The register save offsets from the initial value of vsp */
- reg_offsets = g_new0 (gint32, 16);
- for (i = 0; i < 16; ++i)
- reg_offsets [i] = -1;
-
- /* section 9.3 in the ehabi doc */
- for (i = 0; i < nops; ++i) {
- guint8 op = unwind_ops [i];
-
- if ((op >> 6) == 0) {
- /* vsp = vsp + (xxxxxx << 2) + 4. */
- vsp_offset += ((op & 0x3f) << 2) + 4;
- } else if ((op >> 6) == 1) {
- /* vsp = vsp - (xxxxxx << 2) - 4. */
- vsp_offset -= ((op & 0x3f) << 2) + 4;
- } else if (op == 0xb2) {
- /* vsp = vsp = vsp + 0x204 + (uleb128 << 2) */
- guint8 *p = unwind_ops + i + 1;
- guint32 v = decode_uleb128 (p, &p);
-
- vsp_offset += 0x204 + (v << 2);
- i = (p - unwind_ops) - 1;
- } else if (op >= 0x80 && op <= 0x8f) {
- /* pop registers */
- guint8 op2;
- GSList *regs;
- int j;
-
- g_assert (i + 1 < nops);
- op2 = unwind_ops [i + 1];
-
- regs = NULL;
- for (j = 0; j < 8; ++j)
- if (op2 & (0x1 << j))
- regs = g_slist_append (regs, GUINT_TO_POINTER (ARMREG_R4 + j));
- for (j = 0; j < 4; ++j)
- if (op & (0x1 << j))
- regs = g_slist_append (regs, GUINT_TO_POINTER (ARMREG_R12 + j));
- g_assert (regs);
-
- for (j = 0; j < g_slist_length (regs); ++j)
- reg_offsets [GPOINTER_TO_UINT (g_slist_nth (regs, j)->data)] = vsp_offset + (j * 4);
-
- vsp_offset += g_slist_length (regs) * 4;
-
- g_slist_free (regs);
-
- i ++;
- } else if (op >= 0xa8 && op <= 0xaf) {
- GSList *regs;
- int j;
-
- /* pop r4-r[4 + nnn], r14 */
-
- regs = NULL;
- for (j = 0; j <= (op & 0x7); ++j)
- regs = g_slist_append (regs, GUINT_TO_POINTER (ARMREG_R4 + j));
- regs = g_slist_append (regs, GUINT_TO_POINTER (ARMREG_R14));
-
- for (j = 0; j < g_slist_length (regs); ++j)
- reg_offsets [GPOINTER_TO_UINT (g_slist_nth (regs, j)->data)] = vsp_offset + (j * 4);
-
- vsp_offset += g_slist_length (regs) * 4;
-
- g_slist_free (regs);
- } else if (op == 0xb0) {
- /* finish */
- break;
- } else if (op >= 0x90 && op <= 0x9f && op != 0x9d && op != 0x9f) {
- /* vsp = <reg> */
- vsp_reg = op & 0xf;
- vsp_offset = 0;
- } else {
- int j;
+ for (j = 0; j < ei_len; ++j) {
+ gint32 cindex2 = read32 (type_info [j]);
- for (j = 0; j < nops; ++j)
- printf ("%x ", unwind_ops [j]);
- printf (" / %d\n", i);
- g_assert_not_reached ();
+ if (cindex2 == nesting_cindex)
+ nested_len ++;
+ }
}
}
- ops = NULL;
-
- /* vsp_reg + vsp_offset = CFA */
- mono_add_unwind_op_def_cfa (ops, (guint8*)NULL, (guint8*)NULL, vsp_reg, vsp_offset);
-
- for (i = 0; i < 16; ++i) {
- if (reg_offsets [i] != -1)
- /* The reg is saved at vsp_reg + reg_offset [i] == CFA - (vsp_offset - reg_offset [i]) */
- mono_add_unwind_op_offset (ops, (guint8*)NULL, (guint8*)NULL, i, - (vsp_offset - reg_offsets [i]));
- }
-
- return ops;
-}
-
-/*
- * decode_arm_exidx:
- *
- * Decode the exception handling information in the .ARM.exidx section of the AOT
- * file belong to CODE, and construct a MonoJitInfo structure from it.
- * LOCKING: Acquires the domain lock.
- */
-static void
-decode_arm_exidx (MonoAotModule *amodule, MonoDomain *domain,
- MonoMethod *method, guint8 *code, guint32 code_len, MonoJitInfo *jinfo)
-{
- guint32 *table;
- guint8 *base, *code1, *code2;
- int i, pos, left, right, offset, offset1, offset2, count, nwords, nops;
- guint32 entry;
- guint8 unwind_ops [64];
- GSList *ops;
- guint8 *unwind_info;
- guint32 unw_len;
-
- g_assert (amodule->arm_exidx);
-
- table = (guint32*)amodule->arm_exidx;
-
- /*
- * The table format is described in:
- * infocenter.arm.com/help/topic/com.arm.doc.../IHI0038A_ehabi.pdf
+ /*
+ * LLVM might represent one IL region with multiple regions, so have to
+ * allocate a new JI.
*/
+ jinfo =
+ mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO + (sizeof (MonoJitExceptionInfo) * (ei_len + nested_len)) + extra_size);
- base = amodule->arm_exidx;
- count = amodule->arm_exidx_size / 8;
-
- /* Binary search in the table to find the entry for code */
- offset = code - base;
-
- left = 0;
- right = count;
- while (TRUE) {
- pos = (left + right) / 2;
-
- if (left == right)
- break;
-
- offset1 = EXTEND_PREL31 (table [(pos * 2)]);
- code1 = (guint8*)&(table [pos * 2]) + offset1;
- if (pos + 1 == count)
- /* FIXME: */
- offset2 = amodule->code_end - amodule->code;
- else
- offset2 = EXTEND_PREL31 (table [(pos + 1) * 2]);
- code2 = (guint8*)&(table [(pos + 1) * 2]) + offset2;
-
- if (code < code1)
- right = pos;
- else if (code >= code2)
- left = pos + 1;
- else
- break;
- }
+ jinfo->code_size = code_len;
+ jinfo->used_regs = mono_cache_unwind_info (info.unw_info, info.unw_info_len);
+ jinfo->method = method;
+ jinfo->code_start = code;
+ jinfo->domain_neutral = 0;
+ /* This signals that used_regs points to a normal cached unwind info */
+ jinfo->from_aot = 0;
+ jinfo->num_clauses = ei_len + nested_len;
- if (code >= code1) {
- /*
- * The linker might merge duplicate unwind table entries, so
- * offset1 and offset2 might point to another method, but this is not a problem.
+ for (i = 0; i < ei_len; ++i) {
+ /*
+ * orig_jinfo contains the original IL exception info saved by the AOT
+ * compiler, we have to combine that with the information produced by LLVM
*/
- code1 = (guint8*)&(table [pos * 2]) + offset1;
- code2 = (guint8*)&(table [(pos + 1) * 2]) + offset2;
-
- g_assert (code >= code1);
- if (pos < count)
- g_assert (code < code2);
-
- entry = table [(pos * 2) + 1];
+ /* The type_info entries contain IL clause indexes */
+ int clause_index = read32 (type_info [i]);
+ MonoJitExceptionInfo *jei = &jinfo->clauses [i];
+ MonoJitExceptionInfo *orig_jei = &clauses [clause_index];
- /* inline entry, compact model, personality routine 0 */
- if ((entry & 0xff000000) == 0x80000000) {
- nops = 3;
- unwind_ops [0] = (entry & 0x00ff0000) >> 16;
- unwind_ops [1] = (entry & 0x0000ff00) >> 8;
- unwind_ops [2] = (entry & 0x000000ff) >> 0;
+ g_assert (clause_index < num_clauses);
+ jei->flags = orig_jei->flags;
+ jei->data.catch_class = orig_jei->data.catch_class;
- ops = decode_arm_eh_ops (unwind_ops, nops);
- } else if ((entry & 0x80000000) == 0) {
- /* non-inline entry */
- guint8 *data = (guint8*)&table [(pos * 2) + 1] + EXTEND_PREL31 (entry);
+ jei->try_start = ei [i].try_start;
+ jei->try_end = ei [i].try_end;
+ jei->handler_start = ei [i].handler_start;
- entry = ((guint32*)data) [0];
+ /* Make sure we transition to thumb when a handler starts */
+ if (amodule->thumb_end && (guint8*)jei->handler_start < amodule->thumb_end)
+ jei->handler_start = (void*)((mgreg_t)jei->handler_start + 1);
+ }
- /* compact model, personality routine 1 */
- g_assert ((entry & 0xff000000) == 0x81000000);
+ /* See exception_cb () in mini-llvm.c as to why this is needed */
+ nindex = ei_len;
+ for (i = 0; i < ei_len; ++i) {
+ gint32 cindex1 = read32 (type_info [i]);
+ GSList *l;
- nwords = (entry & 0x00ff0000) >> 16;
- nops = nwords * 4 + 2;
- g_assert (nops < 64);
+ for (l = nesting [cindex1]; l; l = l->next) {
+ gint32 nesting_cindex = GPOINTER_TO_INT (l->data);
- unwind_ops [0] = (entry & 0x0000ff00) >> 8;
- unwind_ops [1] = (entry & 0x000000ff) >> 0;
+ for (j = 0; j < ei_len; ++j) {
+ gint32 cindex2 = read32 (type_info [j]);
- for (i = 0; i < nwords; ++i) {
- entry = ((guint32*)data) [1 + i];
- unwind_ops [(i * 4) + 2] = (entry & 0xff000000) >> 24;
- unwind_ops [(i * 4) + 2 + 1] = (entry & 0x00ff0000) >> 16;
- unwind_ops [(i * 4) + 2 + 2] = (entry & 0x0000ff00) >> 8;
- unwind_ops [(i * 4) + 2 + 3] = (entry & 0x000000ff) >> 0;
+ if (cindex2 == nesting_cindex) {
+ /*
+ * The try interval comes from the nested clause, everything else from the
+ * nesting clause.
+ */
+ memcpy (&jinfo->clauses [nindex], &jinfo->clauses [j], sizeof (MonoJitExceptionInfo));
+ jinfo->clauses [nindex].try_start = jinfo->clauses [i].try_start;
+ jinfo->clauses [nindex].try_end = jinfo->clauses [i].try_end;
+ nindex ++;
+ }
}
-
- ops = decode_arm_eh_ops (unwind_ops, nops);
- } else {
- NOT_IMPLEMENTED;
}
-
- unwind_info = mono_unwind_ops_encode (ops, &unw_len);
- } else {
- /* The method has no unwind info */
- unwind_info = NULL;
- unw_len = 0;
}
+ g_assert (nindex == ei_len + nested_len);
- jinfo->code_size = code_len;
- jinfo->used_regs = mono_cache_unwind_info (unwind_info, unw_len);
- jinfo->method = method;
- jinfo->code_start = code;
- jinfo->domain_neutral = 0;
- /* This signals that used_regs points to a normal cached unwind info */
- jinfo->from_aot = 0;
+ return jinfo;
}
-#endif
/*
* LOCKING: Acquires the domain lock.
MonoMethod *method, guint8* ex_info, guint8 *addr,
guint8 *code, guint32 code_len)
{
- int i, buf_len;
+ int i, buf_len, num_clauses;
MonoJitInfo *jinfo;
guint used_int_regs, flags;
- gboolean has_generic_jit_info, has_dwarf_unwind_info, has_clauses, has_seq_points;
- gboolean from_llvm;
+ gboolean has_generic_jit_info, has_dwarf_unwind_info, has_clauses, has_seq_points, has_try_block_holes;
+ gboolean from_llvm, has_gc_map;
guint8 *p;
- int generic_info_size;
+ int generic_info_size, try_holes_info_size, num_holes, this_reg = 0, this_offset = 0;
/* Load the method info from the AOT file */
has_clauses = (flags & 4) != 0;
has_seq_points = (flags & 8) != 0;
from_llvm = (flags & 16) != 0;
+ has_try_block_holes = (flags & 32) != 0;
+ has_gc_map = (flags & 64) != 0;
+
if (has_dwarf_unwind_info) {
guint32 offset;
else
generic_info_size = 0;
+ if (has_try_block_holes) {
+ num_holes = decode_value (p, &p);
+ try_holes_info_size = sizeof (MonoTryBlockHoleTableJitInfo) + num_holes * sizeof (MonoTryBlockHoleJitInfo);
+ } else {
+ num_holes = try_holes_info_size = 0;
+ }
/* Exception table */
- if (has_clauses) {
- int num_clauses = decode_value (p, &p);
+ if (has_clauses)
+ num_clauses = decode_value (p, &p);
+ else
+ num_clauses = 0;
+
+ if (from_llvm) {
+ MonoJitExceptionInfo *clauses;
+ GSList **nesting;
+
+ /*
+ * Part of the info is encoded by the AOT compiler, the rest is in the .eh_frame
+ * section.
+ */
+ clauses = g_new0 (MonoJitExceptionInfo, num_clauses);
+ nesting = g_new0 (GSList*, num_clauses);
+
+ for (i = 0; i < num_clauses; ++i) {
+ MonoJitExceptionInfo *ei = &clauses [i];
+
+ ei->flags = decode_value (p, &p);
+
+ if (decode_value (p, &p))
+ ei->data.catch_class = decode_klass_ref (amodule, p, &p);
+
+ /* Read the list of nesting clauses */
+ while (TRUE) {
+ int nesting_index = decode_value (p, &p);
+ if (nesting_index == -1)
+ break;
+ nesting [i] = g_slist_prepend (nesting [i], GINT_TO_POINTER (nesting_index));
+ }
+ }
+
+ jinfo = decode_llvm_mono_eh_frame (amodule, domain, method, code, clauses, num_clauses, generic_info_size + try_holes_info_size, nesting, &this_reg, &this_offset);
+ jinfo->from_llvm = 1;
+ g_free (clauses);
+ for (i = 0; i < num_clauses; ++i)
+ g_slist_free (nesting [i]);
+ g_free (nesting);
+ } else {
jinfo =
- mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO + (sizeof (MonoJitExceptionInfo) * num_clauses) + generic_info_size);
+ mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO + (sizeof (MonoJitExceptionInfo) * num_clauses) + generic_info_size + try_holes_info_size);
jinfo->num_clauses = num_clauses;
- for (i = 0; i < num_clauses; ++i) {
+ for (i = 0; i < jinfo->num_clauses; ++i) {
MonoJitExceptionInfo *ei = &jinfo->clauses [i];
ei->flags = decode_value (p, &p);
+
ei->exvar_offset = decode_value (p, &p);
- if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER)
+ if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER || ei->flags == MONO_EXCEPTION_CLAUSE_FINALLY)
ei->data.filter = code + decode_value (p, &p);
else {
if (decode_value (p, &p))
ei->try_end = code + decode_value (p, &p);
ei->handler_start = code + decode_value (p, &p);
}
- }
- else {
- jinfo = mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO + generic_info_size);
- }
- if (from_llvm) {
- /* LLVM compiled method */
- /* The info is in the .eh_frame section */
-#ifdef TARGET_ARM
- decode_arm_exidx (amodule, domain, method, code, code_len, jinfo);
-#else
- decode_eh_frame (amodule, domain, method, code, jinfo);
-#endif
- jinfo->from_llvm = 1;
- } else {
jinfo->code_size = code_len;
jinfo->used_regs = used_int_regs;
jinfo->method = method;
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);
+ if (from_llvm) {
+ gi->has_this = this_reg != -1;
+ gi->this_reg = this_reg;
+ gi->this_offset = this_offset;
+ } else {
+ 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 (amodule, p, &p);
+ jinfo->method = decode_resolve_method_ref (amodule, p, &p);
+ }
+
+ if (has_try_block_holes) {
+ MonoTryBlockHoleTableJitInfo *table;
+
+ jinfo->has_try_block_holes = 1;
+
+ table = mono_jit_info_get_try_block_hole_table_info (jinfo);
+ g_assert (table);
+
+ table->num_holes = (guint16)num_holes;
+ for (i = 0; i < num_holes; ++i) {
+ MonoTryBlockHoleJitInfo *hole = &table->holes [i];
+ hole->clause = decode_value (p, &p);
+ hole->length = decode_value (p, &p);
+ hole->offset = decode_value (p, &p);
+ }
}
if (has_seq_points) {
/* Load debug info */
buf_len = decode_value (p, &p);
mono_debug_add_aot_method (domain, method, code, p, buf_len);
+ p += buf_len;
+
+ if (has_gc_map) {
+ int map_size = decode_value (p, &p);
+ /* The GC map requires 4 bytes of alignment */
+ while ((guint64)(gsize)p % 4)
+ p ++;
+ jinfo->gc_info = p;
+ p += map_size;
+ }
if (amodule != jinfo->method->klass->image->aot_module) {
mono_aot_lock ();
g_hash_table_insert (ji_to_amodule, jinfo, amodule);
mono_aot_unlock ();
}
-
+
return jinfo;
}
amodule = g_hash_table_lookup (ji_to_amodule, ji);
g_assert (amodule);
g_assert (code >= amodule->code && code <= amodule->code_end);
+ mono_aot_unlock ();
}
p = amodule->unwind_info + ji->used_regs;
return p;
}
-static int
+static G_GNUC_UNUSED int
compare_ints (const void *a, const void *b)
{
return *(gint32*)a - *(gint32*)b;
}
+static void
+msort_code_offsets_internal (gint32 *array, int lo, int hi, gint32 *scratch)
+{
+ int mid = (lo + hi) / 2;
+ int i, t_lo, t_hi;
+
+ if (lo >= hi)
+ return;
+
+ if (hi - lo < 32) {
+ for (i = lo; i < hi; ++i)
+ if (array [(i * 2)] > array [(i * 2) + 2])
+ break;
+ if (i == hi)
+ /* Already sorted */
+ return;
+ }
+
+ msort_code_offsets_internal (array, lo, mid, scratch);
+ msort_code_offsets_internal (array, mid + 1, hi, scratch);
+
+ if (array [mid * 2] < array [(mid + 1) * 2])
+ return;
+
+ /* Merge */
+ t_lo = lo;
+ t_hi = mid + 1;
+ for (i = lo; i <= hi; i ++) {
+ if (t_lo <= mid && ((t_hi > hi) || array [t_lo * 2] < array [t_hi * 2])) {
+ scratch [(i * 2)] = array [t_lo * 2];
+ scratch [(i * 2) + 1] = array [(t_lo *2) + 1];
+ t_lo ++;
+ } else {
+ scratch [(i * 2)] = array [t_hi * 2];
+ scratch [(i * 2) + 1] = array [(t_hi *2) + 1];
+ t_hi ++;
+ }
+ }
+ for (i = lo; i <= hi; ++i) {
+ array [(i * 2)] = scratch [i * 2];
+ array [(i * 2) + 1] = scratch [(i * 2) + 1];
+ }
+}
+
+static void
+msort_code_offsets (gint32 *array, int len)
+{
+ gint32 *scratch;
+
+ scratch = g_new (gint32, len * 2);
+ msort_code_offsets_internal (array, 0, len - 1, scratch);
+ g_free (scratch);
+}
+
MonoJitInfo *
mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
{
guint32 *table;
int nmethods = amodule->info.nmethods;
gint32 *code_offsets;
- int i;
+ int offsets_len, i;
if (!amodule)
return NULL;
/* Compute a sorted table mapping code offsets to method indexes. */
if (!amodule->sorted_code_offsets) {
code_offsets = g_new0 (gint32, nmethods * 2);
+ offsets_len = 0;
for (i = 0; i < nmethods; ++i) {
- code_offsets [(i * 2)] = amodule->code_offsets [i];
- code_offsets [(i *2) + 1] = i;
+ /* Skip the -1 entries to speed up sorting */
+ if (amodule->code_offsets [i] == 0xffffffff)
+ continue;
+ code_offsets [(offsets_len * 2)] = amodule->code_offsets [i];
+ code_offsets [(offsets_len *2) + 1] = i;
+ offsets_len ++;
}
- /* FIXME: Use a merge sort as this is mostly sorted */
- qsort (code_offsets, nmethods, sizeof (gint32) * 2, compare_ints);
- for (i = 0; i < nmethods -1; ++i)
+ /* Use a merge sort as this is mostly sorted */
+ msort_code_offsets (code_offsets, offsets_len);
+ //qsort (code_offsets, offsets_len, sizeof (gint32) * 2, compare_ints);
+ for (i = 0; i < offsets_len -1; ++i)
g_assert (code_offsets [(i * 2)] <= code_offsets [(i + 1) * 2]);
if (InterlockedCompareExchangePointer ((gpointer*)&amodule->sorted_code_offsets, code_offsets, NULL) != NULL)
/* Somebody got in before us */
g_free (code_offsets);
+ amodule->sorted_code_offsets_len = offsets_len;
}
code_offsets = amodule->sorted_code_offsets;
+ offsets_len = amodule->sorted_code_offsets_len;
/* Binary search in the sorted_code_offsets table */
left = 0;
- right = nmethods;
+ right = offsets_len;
while (TRUE) {
pos = (left + right) / 2;
offset1 = code_offsets [(pos * 2)];
- if (pos + 1 == nmethods)
+ if (pos + 1 == offsets_len)
offset2 = amodule->code_end - amodule->code;
else
offset2 = code_offsets [(pos + 1) * 2];
}
g_assert (offset >= code_offsets [(pos * 2)]);
- if (pos + 1 < nmethods)
+ if (pos + 1 < offsets_len)
g_assert (offset < code_offsets [((pos + 1) * 2)]);
method_index = code_offsets [(pos * 2) + 1];
code = &amodule->code [amodule->code_offsets [method_index]];
ex_info = &amodule->blob [mono_aot_get_offset (amodule->ex_info_offsets, method_index)];
- if (pos == nmethods - 1)
+ if (pos == offsets_len - 1)
code_len = amodule->code_end - code;
else
code_len = code_offsets [(pos + 1) * 2] - code_offsets [pos * 2];
p = amodule->blob + table [(pos * 2) + 1];
is_wrapper = decode_value (p, &p);
g_assert (!is_wrapper);
- method = decode_method_ref_2 (amodule, p, &p);
+ method = decode_resolve_method_ref (amodule, p, &p);
g_assert (method);
} else {
token = mono_metadata_make_token (MONO_TABLE_METHOD, method_index + 1);
case MONO_PATCH_INFO_METHOD_JUMP:
case MONO_PATCH_INFO_ICALL_ADDR:
case MONO_PATCH_INFO_METHOD_RGCTX: {
- guint32 token;
- MonoMethod *method;
- gboolean no_aot_trampoline;
+ MethodRef ref;
+ gboolean res;
- image = decode_method_ref (aot_module, &token, &method, &no_aot_trampoline, p, &p);
- if (!image)
+ res = decode_method_ref (aot_module, &ref, p, &p);
+ if (!res)
goto cleanup;
- 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_ftnptr (mono_domain_get (), mono_create_jit_trampoline_from_token (image, token));
+ if (!ref.method && !mono_aot_only && !ref.no_aot_trampoline && (ji->type == MONO_PATCH_INFO_METHOD) && (mono_metadata_token_table (ref.token) == MONO_TABLE_METHOD)) {
+ ji->data.target = mono_create_ftnptr (mono_domain_get (), mono_create_jit_trampoline_from_token (ref.image, ref.token));
ji->type = MONO_PATCH_INFO_ABS;
}
else {
- if (method)
- ji->data.method = method;
+ if (ref.method)
+ ji->data.method = ref.method;
else
- ji->data.method = mono_get_method (image, token, NULL);
+ ji->data.method = mono_get_method (ref.image, ref.token, NULL);
g_assert (ji->data.method);
mono_class_init (ji->data.method->klass);
}
}
case MONO_PATCH_INFO_METHODCONST:
/* Shared */
- ji->data.method = decode_method_ref_2 (aot_module, p, &p);
+ ji->data.method = decode_resolve_method_ref (aot_module, p, &p);
if (!ji->data.method)
goto cleanup;
break;
case MONO_PATCH_INFO_SWITCH:
ji->data.table = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoBBTable));
ji->data.table->table_size = decode_value (p, &p);
- table = g_new (gpointer, ji->data.table->table_size);
+ table = mono_domain_alloc (mono_domain_get (), sizeof (gpointer) * ji->data.table->table_size);
ji->data.table->table = (MonoBasicBlock**)table;
for (i = 0; i < ji->data.table->table_size; i++)
table [i] = (gpointer)(gssize)decode_value (p, &p);
case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
case MONO_PATCH_INFO_MONITOR_ENTER:
case MONO_PATCH_INFO_MONITOR_EXIT:
+ case MONO_PATCH_INFO_GC_CARD_TABLE_ADDR:
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->method = decode_resolve_method_ref (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));
case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE: {
MonoJumpInfoImtTramp *imt_tramp = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoImtTramp));
- imt_tramp->method = decode_method_ref_2 (aot_module, p, &p);
+ imt_tramp->method = decode_resolve_method_ref (aot_module, p, &p);
imt_tramp->vt_offset = decode_value (p, &p);
ji->data.imt_tramp = imt_tramp;
info = &amodule->blob [mono_aot_get_offset (amodule->method_info_offsets, method_index)];
+ if (amodule->thumb_end && code < amodule->thumb_end) {
+ /* Convert this into a thumb address */
+ g_assert ((amodule->code_offsets [method_index] & 0x1) == 0);
+ code = &amodule->code [amodule->code_offsets [method_index] + 1];
+ }
+
mono_aot_lock ();
if (!amodule->methods_loaded)
amodule->methods_loaded = g_new0 (guint32, amodule->info.nmethods + 1);
index = value;
break;
}
- } else if (can_method_ref_match_method (amodule, p, method)) {
+ } else {
+ guint8 *orig_p = p;
+
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);
+ m = decode_resolve_method_ref_with_target (amodule, method, p, &p);
if (m) {
mono_aot_lock ();
g_hash_table_insert (amodule->method_ref_to_method, orig_p, m);
}
/* Methods decoded needlessly */
- /*
- if (m)
- printf ("%d %s %s\n", n_extra_decodes, mono_method_full_name (method, TRUE), mono_method_full_name (m, TRUE));
- */
- n_extra_decodes ++;
+ if (m) {
+ //printf ("%d %s %s %p\n", n_extra_decodes, mono_method_full_name (method, TRUE), mono_method_full_name (m, TRUE), orig_p);
+ n_extra_decodes ++;
+ }
}
if (next != 0)
g_assert (klass->inited);
/* Find method index */
- if (method->is_inflated && mono_method_is_generic_sharable_impl (method, FALSE)) {
+ if (method->is_inflated && mono_method_is_generic_sharable_impl_full (method, FALSE, FALSE)) {
+ /*
+ * For generic methods, we store the fully shared instance in place of the
+ * original method.
+ */
method = mono_method_get_declaring_generic_method (method);
method_index = mono_metadata_token_index (method->token) - 1;
} else if (method->is_inflated || !method->token) {
return code;
}
+ /* Same for CompareExchange<T> */
+ if (method_index == 0xffffff && method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE && method->klass->image == mono_defaults.corlib && !strcmp (method->klass->name_space, "System.Threading") && !strcmp (method->klass->name, "Interlocked") && !strcmp (method->name, "CompareExchange")) {
+ MonoMethod *m;
+ MonoGenericContext ctx;
+ MonoType *args [16];
+ gpointer iter = NULL;
+
+ while ((m = mono_class_get_methods (method->klass, &iter))) {
+ if (mono_method_signature (m)->generic_param_count && !strcmp (m->name, "CompareExchange"))
+ break;
+ }
+ g_assert (m);
+
+ memset (&ctx, 0, sizeof (ctx));
+ args [0] = &mono_defaults.object_class->byval_arg;
+ ctx.method_inst = mono_metadata_get_generic_inst (1, args);
+
+ m = mono_marshal_get_native_wrapper (mono_class_inflate_generic_method (m, &ctx), TRUE, TRUE);
+
+ /* Avoid recursion */
+ if (method == m)
+ return NULL;
+
+ /*
+ * Get the code for the <object> instantiation which should be emitted into
+ * the mscorlib aot image by the AOT compiler.
+ */
+ code = mono_aot_get_method (domain, m);
+ if (code)
+ return code;
+ }
+
+ if (method_index == 0xffffff && method->is_inflated && mono_method_is_generic_sharable_impl_full (method, FALSE, TRUE)) {
+ /* Partial sharing */
+ method_index = find_extra_method (mini_get_shared_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;
return user_data.module;
}
+void
+mono_aot_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *addr)
+{
+ /*
+ * Since AOT code is only used in the root domain,
+ * mono_domain_get () != mono_get_root_domain () means the calling method
+ * is AppDomain:InvokeInDomain, so this is the same check as in
+ * mono_method_same_domain () but without loading the metadata for the method.
+ */
+ if (mono_domain_get () == mono_get_root_domain ())
+ mono_arch_patch_plt_entry (code, got, regs, addr);
+}
+
/*
* mono_aot_plt_resolve:
*
/* 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);
- mono_arch_patch_plt_entry (plt_entry, module->got, NULL, target);
+ mono_aot_patch_plt_entry (plt_entry, module->got, NULL, target);
return target;
#else
static void
init_plt (MonoAotModule *amodule)
{
-#ifndef MONO_CROSS_COMPILE
-
-#ifdef MONO_ARCH_AOT_SUPPORTED
-#ifdef __i386__
- guint8 *buf = amodule->plt;
-#elif defined(__x86_64__) || defined(__arm__) || defined(__mono_ppc__)
int i;
- gpointer plt_0;
-#endif
gpointer tramp;
if (amodule->plt_inited)
tramp = mono_create_specific_trampoline (amodule, MONO_TRAMPOLINE_AOT_PLT, mono_get_root_domain (), NULL);
-#ifdef __i386__
- /* Initialize the first PLT entry */
- make_writable (amodule->plt, amodule->plt_end - amodule->plt);
- x86_jump_code (buf, tramp);
-#elif defined(__x86_64__) || defined(__arm__) || defined(__mono_ppc__)
/*
* Initialize the PLT entries in the GOT to point to the default targets.
*/
tramp = mono_create_ftnptr (mono_domain_get (), tramp);
- plt_0 = mono_create_ftnptr (mono_domain_get (), amodule->plt);
- /* The first entry points to the AOT trampoline */
- ((gpointer*)amodule->got)[amodule->info.plt_got_offset_base] = tramp;
for (i = 1; i < amodule->info.plt_size; ++i)
- /* All the default entries point to the first entry */
- ((gpointer*)amodule->got)[amodule->info.plt_got_offset_base + i] = plt_0;
-#else
- g_assert_not_reached ();
-#endif
+ /* All the default entries point to the AOT trampoline */
+ ((gpointer*)amodule->got)[amodule->info.plt_got_offset_base + i] = tramp;
amodule->plt_inited = TRUE;
-#endif
-
-#endif /* MONO_CROSS_COMPILE */
}
/*
guint8*
mono_aot_get_plt_entry (guint8 *code)
{
- MonoAotModule *aot_module = find_aot_module (code);
-#if defined(__arm__) || defined(__mono_ppc__)
- guint32 ins;
-#endif
+ MonoAotModule *amodule = find_aot_module (code);
+ guint8 *target = NULL;
- if (!aot_module)
+ if (!amodule)
return NULL;
-#if defined(__i386__) || defined(__x86_64__)
- if (code [-5] == 0xe8) {
- guint32 disp = *(guint32*)(code - 4);
- guint8 *target = code + disp;
-
- if ((target >= (guint8*)(aot_module->plt)) && (target < (guint8*)(aot_module->plt_end)))
- return target;
+#ifdef TARGET_ARM
+ if (amodule->thumb_end && code < amodule->thumb_end) {
+ return mono_arm_get_thumb_plt_entry (code);
}
-#elif defined(__arm__)
- ins = ((guint32*)(gpointer)code) [-1];
-
- /* Should be a 'bl' */
- if ((((ins >> 25) & 0x7) == 0x5) && (((ins >> 24) & 0x1) == 0x1)) {
- gint32 disp = ((gint32)ins) & 0xffffff;
- guint8 *target = code - 4 + 8 + (disp * 4);
-
- if ((target >= (guint8*)(aot_module->plt)) && (target < (guint8*)(aot_module->plt_end)))
- return target;
- }
-#elif defined(__mono_ppc__)
- /* Should be a bl */
- ins = ((guint32*)(gpointer)code) [-1];
-
- if ((ins >> 26 == 18) && ((ins & 1) == 1) && ((ins & 2) == 0)) {
- gint32 disp = (((gint32)ins) >> 2) & 0xffffff;
- guint8 *target = code - 4 + (disp * 4);
+#endif
- if ((target >= (guint8*)(aot_module->plt)) && (target < (guint8*)(aot_module->plt_end)))
- return target;
- }
+#ifdef MONO_ARCH_AOT_SUPPORTED
+ target = mono_arch_get_call_target (code);
#else
g_assert_not_reached ();
#endif
- return NULL;
+ if ((target >= (guint8*)(amodule->plt)) && (target < (guint8*)(amodule->plt_end)))
+ return target;
+ else
+ return NULL;
}
/*
g_assert (plt_entry);
/* The offset is embedded inside the code after the plt entry */
-#if defined(__i386__)
- return *(guint32*)(plt_entry + 5);
-#elif defined(__x86_64__)
- return *(guint32*)(plt_entry + 6);
-#elif defined(__arm__)
- /* The offset is stored as the 4th word of the plt entry */
- return ((guint32*)plt_entry) [3];
-#elif defined(__mono_ppc__)
-#ifdef PPC_USES_FUNCTION_DESCRIPTOR
- return ((guint32*)plt_entry) [8];
-#else
- return ((guint32*)plt_entry) [6];
-#endif
+#ifdef MONO_ARCH_AOT_SUPPORTED
+ return mono_arch_get_plt_info_offset (plt_entry, regs, code);
#else
g_assert_not_reached ();
return 0;
#endif
}
+/*
+ * mono_aot_register_jit_icall:
+ *
+ * Register a JIT icall which is called by trampolines in full-aot mode. This should
+ * be called from mono_arch_init () during startup.
+ */
+void
+mono_aot_register_jit_icall (const char *name, gpointer addr)
+{
+ /* No need for locking */
+ if (!aot_jit_icall_hash)
+ aot_jit_icall_hash = g_hash_table_new (g_str_hash, g_str_equal);
+ g_hash_table_insert (aot_jit_icall_hash, (char*)name, addr);
+}
+
/*
* load_function:
*
target = mono_exception_from_token;
} else if (!strcmp (ji->data.name, "mono_throw_exception")) {
target = mono_get_throw_exception ();
-#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
-#ifdef __mono_ppc__
- } else if (!strcmp (ji->data.name, "mono_ppc_throw_exception")) {
- target = mono_ppc_throw_exception;
-#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);
target = mono_create_ftnptr_malloc (target);
} else if (!strcmp (ji->data.name, "mono_thread_get_and_clear_pending_exception")) {
target = mono_thread_get_and_clear_pending_exception;
+ } else if (strstr (ji->data.name, "generic_trampoline_")) {
+ target = mono_aot_get_trampoline (ji->data.name);
+ } else if (aot_jit_icall_hash && g_hash_table_lookup (aot_jit_icall_hash, ji->data.name)) {
+ /* Registered by mono_arch_init () */
+ target = g_hash_table_lookup (aot_jit_icall_hash, ji->data.name);
} else {
fprintf (stderr, "Unknown relocation '%s'\n", ji->data.name);
g_assert_not_reached ();
}
/*
- * Return the piece of code identified by NAME from the mscorlib AOT file.
+ * Return the trampoline identified by NAME from the mscorlib AOT file.
* On ppc64, this returns a function descriptor.
*/
gpointer
-mono_aot_get_named_code (const char *name)
+mono_aot_get_trampoline (const char *name)
{
MonoImage *image;
MonoAotModule *amodule;
if (!generic_trampolines [tramp_type]) {
char *symbol;
- symbol = g_strdup_printf ("generic_trampoline_%d", tramp_type);
- generic_trampolines [tramp_type] = mono_aot_get_named_code (symbol);
+ symbol = mono_get_generic_trampoline_name (tramp_type);
+ generic_trampolines [tramp_type] = mono_aot_get_trampoline (symbol);
g_free (symbol);
}
char *symbol;
gpointer code;
- symbol = g_strdup_printf ("rgctx_fetch_trampoline_%u", slot);
+ symbol = mono_get_rgctx_fetch_trampoline_name (slot);
code = load_function (mono_defaults.corlib->aot_module, symbol);
g_free (symbol);
/* The caller expects an ftnptr */
return NULL;
}
+void
+mono_aot_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *addr)
+{
+}
+
gpointer
mono_aot_get_method_from_vt_slot (MonoDomain *domain, MonoVTable *vtable, int slot)
{
}
gpointer
-mono_aot_get_named_code (const char *name)
+mono_aot_get_trampoline (const char *name)
{
g_assert_not_reached ();
return NULL;
return NULL;
}
+void
+mono_aot_register_jit_icall (const char *name, gpointer addr)
+{
+}
+
#endif
projects / mono.git / blobdiff