/*
- * 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 <errno.h>
#include <sys/stat.h>
-#include <limits.h> /* for PAGESIZE */
-#ifndef PAGESIZE
-#define PAGESIZE 4096
-#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h> /* for WIFEXITED, WEXITSTATUS */
#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-mmap.h>
#include "mono/utils/mono-compiler.h"
+#include <mono/utils/mono-counters.h>
#include "mini.h"
#include "version.h"
#ifdef PLATFORM_WIN32
#define SHARED_EXT ".dll"
-#elif (defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__)) || defined(__MACH__)
+#elif ((defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__)) || defined(__MACH__)) && !defined(__linux__)
#define SHARED_EXT ".dylib"
#else
#define SHARED_EXT ".so"
guint32 opts;
/* Pointer to the Global Offset Table */
gpointer *got;
- guint32 got_size;
GHashTable *name_cache;
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 *code_offsets;
guint8 *method_info;
guint32 *method_info_offsets;
guint32 *extra_method_table;
guint32 *extra_method_info_offsets;
guint8 *extra_method_info;
- guint8 *trampolines;
- guint32 num_trampolines, first_trampoline_got_offset, trampoline_index;
+ guint8 *unwind_info;
+
+ /* Points to the trampolines */
+ guint8 *trampolines [MONO_AOT_TRAMP_NUM];
+ /* The first unused trampoline of each kind */
+ guint32 trampoline_index [MONO_AOT_TRAMP_NUM];
+
+ MonoAotFileInfo info;
+
gpointer *globals;
MonoDl *sofile;
} MonoAotModule;
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
- * other in memory, possibly improving cache behavior. Since the original
- * code is in copy-on-write memory, this will not increase the memory usage
- * of the runtime.
+ * Maps MonoJitInfo* to the aot module they belong to, this can be different
+ * from ji->method->klass->image's aot module for generic instances.
*/
-static gboolean use_loaded_code = TRUE;
+static GHashTable *ji_to_amodule;
/*
* Whenever to AOT compile loaded assemblies on demand and store them in
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 () */
static gsize aot_code_low_addr = (gssize)-1;
static gsize aot_code_high_addr = 0;
-/* Used to communicate with mono_aot_register_globals () */
-static guint32 globals_tls_id = -1;
-
static void
init_plt (MonoAotModule *info);
-static MonoJumpInfo*
-load_patch_info (MonoAotModule *aot_module, MonoMemPool *mp, int n_patches,
- guint32 got_index, guint32 **got_slots,
- guint8 *buf, guint8 **endbuf);
-
-static inline gboolean
-is_got_patch (MonoJumpInfoType patch_type)
-{
- return TRUE;
-}
-
/*****************************************************/
/* AOT RUNTIME */
/*****************************************************/
mono_metadata_free_type (type);
} else if ((type == MONO_TYPE_VAR) || (type == MONO_TYPE_MVAR)) {
MonoType *t;
- gboolean is_method;
MonoGenericContainer *container;
- // FIXME: Maybe use types directly to avoid
- // the overhead of creating MonoClass-es
-
- // FIXME: Memory management
- t = g_new0 (MonoType, 1);
- t->type = type;
- t->data.generic_param = g_new0 (MonoGenericParam, 1);
- t->data.generic_param->num = decode_value (p, &p);
- t->data.generic_param->name = "T";
+ int num = decode_value (p, &p);
+ gboolean is_method = decode_value (p, &p);
- is_method = decode_value (p, &p);
if (is_method) {
- MonoMethod *method_def = decode_method_ref_2 (module, p, &p);
-
- if (!method_def) {
- g_free (t->data.generic_param);
- g_free (t);
+ 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 = decode_klass_ref (module, p, &p);
-
- if (!class_def) {
- g_free (t->data.generic_param);
- g_free (t);
+ 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;
}
g_assert (container);
- t->data.generic_param->owner = 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 ();
}
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_MIN || image_index == MONO_AOT_METHODREF_METHODSPEC || image_index == MONO_AOT_METHODREF_GINST) {
+ if (method->wrapper_type)
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
/*
* decode_method_ref:
*
decode_method_ref (MonoAotModule *module, guint32 *token, MonoMethod **method, gboolean *no_aot_trampoline, guint8 *buf, guint8 **endbuf)
{
guint32 image_index, value;
- MonoImage *image;
+ MonoImage *image = NULL;
guint8 *p = buf;
if (method)
value = decode_value (p, &p);
image_index = value >> 24;
- if (image_index == 252) {
+ 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 == 253) {
- /* Wrapper */
+ if (image_index == MONO_AOT_METHODREF_WRAPPER) {
guint32 wrapper_type;
wrapper_type = decode_value (p, &p);
case MONO_WRAPPER_STELEMREF:
*method = mono_marshal_get_stelemref ();
break;
- case MONO_WRAPPER_STATIC_RGCTX_INVOKE: {
+ case MONO_WRAPPER_SYNCHRONIZED: {
MonoMethod *m = decode_method_ref_2 (module, p, &p);
if (!m)
return NULL;
- *method = mono_marshal_get_static_rgctx_invoke (m);
+ *method = mono_marshal_get_synchronized_wrapper (m);
break;
}
- case MONO_WRAPPER_MONITOR_FAST_ENTER:
- case MONO_WRAPPER_MONITOR_FAST_EXIT: {
+ case MONO_WRAPPER_UNKNOWN: {
MonoMethodDesc *desc;
MonoMethod *orig_method;
+ int subtype = decode_value (p, &p);
- if (wrapper_type == MONO_WRAPPER_MONITOR_FAST_ENTER)
+ if (subtype == MONO_AOT_WRAPPER_MONO_ENTER)
desc = mono_method_desc_new ("Monitor:Enter", FALSE);
- else
+ 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;
}
+ case MONO_WRAPPER_RUNTIME_INVOKE: {
+ /* Direct wrapper */
+ MonoMethod *m = decode_method_ref_2 (module, p, &p);
+
+ if (!m)
+ return NULL;
+ *method = mono_marshal_get_runtime_invoke (m, FALSE);
+ break;
+ }
default:
g_assert_not_reached ();
}
- } else if (image_index == 255) {
- /* Methodspec */
+ } 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 == 254) {
- /* Method on generic instance */
+ } else if (image_index == MONO_AOT_METHODREF_GINST) {
MonoClass *klass;
MonoGenericContext ctx;
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);
return method;
if (!image)
return NULL;
- return mono_get_method (image, token, NULL);
+ method = mono_get_method (image, token, NULL);
+ return method;
}
G_GNUC_UNUSED
static void
make_writable (guint8* addr, guint32 len)
{
-#ifndef PLATFORM_WIN32
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)) & ~ (PAGESIZE - 1));
- pages = (addr + len - page_start + PAGESIZE - 1) / PAGESIZE;
- err = mprotect (page_start, pages * PAGESIZE, PROT_READ | PROT_WRITE | PROT_EXEC);
+ 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);
-#else
- {
- DWORD oldp;
- g_assert (VirtualProtect (addr, len, PAGE_EXECUTE_READWRITE, &oldp) != 0);
- }
-#endif
}
static void
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;
+ gpointer *got_addr;
if (mono_compile_aot)
return;
if (assembly->image->dynamic)
return;
+ if (mono_security_get_mode () == MONO_SECURITY_MODE_CAS)
+ return;
+
mono_aot_lock ();
if (static_aot_modules)
globals = g_hash_table_lookup (static_aot_modules, assembly->aname.name);
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 {
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 (!sofile && !globals) {
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);
}
}
- 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;
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;
+
+ memcpy (&amodule->info, file_info, sizeof (*file_info));
+
+ amodule->got = *got_addr;
amodule->got [0] = assembly->image;
amodule->globals = globals;
amodule->sofile = sofile;
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, "trampolines", (gpointer*)&amodule->trampolines);
+ 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->mem_begin = amodule->code;
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
len = amodule->mem_end - amodule->mem_begin;
/* Round down in both directions to avoid modifying data which is not ours */
- page_start = (guint8 *) (((gssize) (addr)) & ~ (PAGESIZE - 1)) + PAGESIZE;
- pages = ((addr + len - page_start + PAGESIZE - 1) / PAGESIZE) - 1;
- err = mprotect (page_start, pages * PAGESIZE, 0);
+ page_start = (guint8 *) (((gssize) (addr)) & ~ (mono_pagesize () - 1)) + mono_pagesize ();
+ pages = ((addr + len - page_start + mono_pagesize () - 1) / mono_pagesize ()) - 1;
+ err = mono_mprotect (page_start, pages * mono_pagesize (), MONO_MMAP_NONE);
g_assert (err == 0);
#endif
}
assembly->image->aot_module = amodule;
+ if (mono_aot_only) {
+ if (mono_defaults.corlib) {
+ /* The second got slot contains the mscorlib got addr */
+ MonoAotModule *mscorlib_amodule = mono_defaults.corlib->aot_module;
+
+ amodule->got [1] = mscorlib_amodule->got;
+ } else {
+ amodule->got [1] = amodule->got;
+ }
+ }
+
/*
* 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.
void
mono_aot_register_globals (gpointer *globals)
{
- TlsSetValue (globals_tls_id, globals);
+ g_assert_not_reached ();
}
/*
{
InitializeCriticalSection (&aot_mutex);
aot_modules = g_hash_table_new (NULL, NULL);
- globals_tls_id = TlsAlloc ();
mono_install_assembly_load_hook (load_aot_module, NULL);
- if (getenv ("MONO_LASTAOT"))
- mono_last_aot_method = atoi (getenv ("MONO_LASTAOT"));
- if (getenv ("MONO_AOT_CACHE"))
+ if (g_getenv ("MONO_LASTAOT"))
+ mono_last_aot_method = atoi (g_getenv ("MONO_LASTAOT"));
+ if (g_getenv ("MONO_AOT_CACHE"))
use_aot_cache = TRUE;
}
full_name = g_strdup_printf ("%s.%s", name_space, name);
}
}
- hash = g_str_hash (full_name) % table_size;
+ hash = mono_aot_str_hash (full_name) % table_size;
if (full_name != full_name_buf)
g_free (full_name);
return TRUE;
}
+/*
+ * LOCKING: Acquires the domain lock.
+ */
static MonoJitInfo*
-decode_exception_debug_info (MonoAotModule *aot_module, MonoDomain *domain,
+decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
MonoMethod *method, guint8* ex_info, guint8 *code)
{
int i, buf_len;
MonoJitInfo *jinfo;
- guint code_len, used_int_regs;
- gboolean has_generic_jit_info;
+ guint code_len, used_int_regs, flags;
+ gboolean has_generic_jit_info, has_dwarf_unwind_info;
guint8 *p;
MonoMethodHeader *header;
int generic_info_size;
p = ex_info;
code_len = decode_value (p, &p);
- used_int_regs = decode_value (p, &p);
- has_generic_jit_info = decode_value (p, &p);
+ flags = decode_value (p, &p);
+ has_generic_jit_info = (flags & 1) != 0;
+ has_dwarf_unwind_info = (flags & 2) != 0;
+ if (has_dwarf_unwind_info) {
+ guint32 offset;
+
+ offset = decode_value (p, &p);
+ g_assert (offset < (1 << 30));
+ used_int_regs = offset;
+ } else {
+ used_int_regs = decode_value (p, &p);
+ }
if (has_generic_jit_info)
generic_info_size = sizeof (MonoGenericJitInfo);
else
/* Exception table */
if (header && header->num_clauses) {
jinfo =
- mono_domain_alloc0 (domain, sizeof (MonoJitInfo) + (sizeof (MonoJitExceptionInfo) * header->num_clauses) + generic_info_size);
+ mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO + (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_domain_alloc0 (domain, sizeof (MonoJitInfo) + generic_info_size);
+ else {
+ jinfo = mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO + 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;
/* This currently contains no data */
gi->generic_sharing_context = g_new0 (MonoGenericSharingContext, 1);
- jinfo->method = decode_method_ref_2 (aot_module, p, &p);
+ jinfo->method = decode_method_ref_2 (amodule, p, &p);
}
/* Load debug info */
buf_len = decode_value (p, &p);
mono_debug_add_aot_method (domain, method, code, p, buf_len);
+
+ if (amodule != jinfo->method->klass->image->aot_module) {
+ mono_aot_lock ();
+ if (!ji_to_amodule)
+ ji_to_amodule = g_hash_table_new (NULL, NULL);
+ g_hash_table_insert (ji_to_amodule, jinfo, amodule);
+ mono_aot_unlock ();
+ }
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;
+ guint8 *code = ji->code_start;
+
+ g_assert (amodule);
+ g_assert (ji->from_aot);
+
+ if (!(code >= amodule->code && code <= amodule->code_end)) {
+ /* ji belongs to a different aot module than amodule */
+ mono_aot_lock ();
+ g_assert (ji_to_amodule);
+ amodule = g_hash_table_lookup (ji_to_amodule, ji);
+ g_assert (amodule);
+ g_assert (code >= amodule->code && code <= amodule->code_end);
+ }
+
+ p = amodule->unwind_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)
{
-
int pos, left, right, offset, offset1, offset2, last_offset, new_offset;
int page_index, method_index, table_len, is_wrapper;
guint32 token;
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:
- return TRUE;
- default:
- return FALSE;
- }
-}
-
static gboolean
decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guint8 *buf, guint8 **endbuf)
{
if (!image)
goto cleanup;
-#ifdef MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
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->data.target = mono_create_ftnptr (mono_domain_get (), mono_create_jit_trampoline_from_token (image, token));
ji->type = MONO_PATCH_INFO_ABS;
}
else {
g_assert (ji->data.method);
mono_class_init (ji->data.method->klass);
}
-#else
- ji->data.method = mono_get_method (image, token, NULL);
- g_assert (ji->data.method);
- mono_class_init (ji->data.method->klass);
-#endif
-
break;
}
case MONO_PATCH_INFO_INTERNAL_METHOD:
case MONO_PATCH_INFO_R4: {
guint32 val;
- ji->data.target = mono_mempool_alloc0 (mp, sizeof (float));
+ ji->data.target = mono_domain_alloc0 (mono_domain_get (), sizeof (float));
val = decode_value (p, &p);
*(float*)ji->data.target = *(float*)&val;
break;
case MONO_PATCH_INFO_R8: {
guint32 val [2];
- ji->data.target = mono_mempool_alloc0 (mp, sizeof (double));
+ ji->data.target = mono_domain_alloc0 (mono_domain_get (), sizeof (double));
val [0] = decode_value (p, &p);
val [1] = 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;
return FALSE;
}
-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,
+ guint32 **got_slots,
guint8 *buf, guint8 **endbuf)
{
MonoJumpInfo *patches;
- MonoJumpInfo *patch_info = NULL;
int pindex;
- guint32 last_offset;
guint8 *p;
p = buf;
- /* First load the type + offset table */
- last_offset = 0;
patches = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo) * n_patches);
- for (pindex = 0; pindex < n_patches; ++pindex) {
- MonoJumpInfo *ji = &patches [pindex];
-
- ji->type = *p;
- p ++;
-
- //printf ("T: %d O: %d.\n", ji->type, ji->ip.i);
- ji->next = patch_info;
- patch_info = ji;
- }
-
*got_slots = g_malloc (sizeof (guint32) * n_patches);
- memset (*got_slots, 0xff, sizeof (guint32) * n_patches);
- /* Then load the other data */
for (pindex = 0; pindex < n_patches; ++pindex) {
MonoJumpInfo *ji = &patches [pindex];
+ guint8 *shared_p;
+ gboolean res;
+ guint32 got_offset;
- if (!decode_got_entry (aot_module, mp, ji, p, &p, (*got_slots) + pindex))
- goto cleanup;
+ 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];
+
+ ji->type = decode_value (shared_p, &shared_p);
- if ((*got_slots) [pindex] == 0xffffffff)
- (*got_slots) [pindex] = got_index ++;
+ res = decode_patch (aot_module, mp, ji, shared_p, &shared_p);
+ if (!res)
+ goto cleanup;
+ }
+
+ (*got_slots) [pindex] = got_offset;
}
*endbuf = p;
* METHOD might not be set if the caller only has the image/token info.
*/
static gpointer
-load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoImage *image, MonoMethod *method, guint32 token, int method_index)
+load_method (MonoDomain *domain, MonoAotModule *amodule, MonoImage *image, MonoMethod *method, guint32 token, int method_index)
{
MonoClass *klass;
- MonoJumpInfo *patch_info = NULL;
+ gboolean from_plt = method == NULL;
MonoMemPool *mp;
- int i, pindex, got_index = 0, n_patches, used_strings;
- gboolean non_got_patches, keep_patches = TRUE;
+ int i, pindex, n_patches, used_strings;
+ gboolean keep_patches = TRUE;
guint8 *p, *ex_info;
MonoJitInfo *jinfo = NULL;
guint8 *code, *info;
if (mono_profiler_get_events () & MONO_PROFILE_ENTER_LEAVE)
return NULL;
- if ((domain != mono_get_root_domain ()) && (!(aot_module->opts & MONO_OPT_SHARED)))
+ if ((domain != mono_get_root_domain ()) && (!(amodule->opts & MONO_OPT_SHARED)))
/* Non shared AOT code can't be used in other appdomains */
return NULL;
- if (aot_module->out_of_date)
+ if (amodule->out_of_date)
return NULL;
- if (aot_module->code_offsets [method_index] == 0xffffffff) {
+ if (amodule->code_offsets [method_index] == 0xffffffff) {
if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
char *full_name;
return NULL;
}
- code = &aot_module->code [aot_module->code_offsets [method_index]];
- info = &aot_module->method_info [aot_module->method_info_offsets [method_index]];
+ code = &amodule->code [amodule->code_offsets [method_index]];
+ info = &amodule->method_info [amodule->method_info_offsets [method_index]];
mono_aot_lock ();
- if (!aot_module->methods_loaded)
- aot_module->methods_loaded = g_new0 (guint32, image->tables [MONO_TABLE_METHOD].rows + 1);
+ if (!amodule->methods_loaded)
+ amodule->methods_loaded = g_new0 (guint32, amodule->info.nmethods + 1);
mono_aot_unlock ();
- if ((aot_module->methods_loaded [method_index / 32] >> (method_index % 32)) & 0x1)
+ if ((amodule->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)
+ if (mono_jit_stats.methods_aot >= mono_last_aot_method)
return NULL;
- else
- 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);
+ else if (mono_jit_stats.methods_aot == mono_last_aot_method - 1) {
+ if (method)
+ printf ("LAST AOT METHOD: %s%s%s.%s.\n", method->klass->name_space, method->klass->name_space [0] ? "." : "", method->klass->name, method->name);
+ else
+ printf ("LAST AOT METHOD: %p %d\n", code, method_index);
+ }
}
p = info;
if (method) {
klass = method->klass;
- decode_klass_ref (aot_module, p, &p);
+ decode_klass_ref (amodule, 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 (token) - 1]];
- jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
- }
-
- mono_domain_lock (domain);
- code2 = mono_code_manager_reserve (domain->code_mp, jinfo->code_size);
- mono_domain_unlock (domain);
- memcpy (code2, code, jinfo->code_size);
- mono_arch_flush_icache (code2, jinfo->code_size);
- code = code2;
+ klass = decode_klass_ref (amodule, p, &p);
}
- if (aot_module->opts & MONO_OPT_SHARED)
+ if (amodule->opts & MONO_OPT_SHARED)
used_strings = decode_value (p, &p);
else
used_strings = 0;
mono_ldstr (mono_get_root_domain (), image, mono_metadata_token_index (token));
}
- if (aot_module->opts & MONO_OPT_SHARED)
+ if (amodule->opts & MONO_OPT_SHARED)
keep_patches = FALSE;
n_patches = decode_value (p, &p);
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);
+ patches = load_patch_info (amodule, mp, n_patches, &got_slots, p, &p);
if (patches == NULL)
goto cleanup;
- 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);
- 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;
- }
- 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 (token) - 1]];
- jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code);
+ if (!amodule->got [got_slots [pindex]]) {
+ amodule->got [got_slots [pindex]] = mono_resolve_patch_target (method, domain, code, ji, TRUE);
+ if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
+ amodule->got [got_slots [pindex]] = mono_create_ftnptr (domain, amodule->got [got_slots [pindex]]);
+ if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
+ register_jump_target_got_slot (domain, ji->data.method, &(amodule->got [got_slots [pindex]]));
}
-
- mono_arch_flush_icache (code, jinfo->code_size);
- make_writable (code, jinfo->code_size);
- mono_arch_patch_code (method, domain, code, patch_info, TRUE);
+ ji->type = MONO_PATCH_INFO_NONE;
}
g_free (got_slots);
mono_mempool_destroy (mp);
}
- mono_aot_lock ();
-
- mono_jit_stats.methods_aot++;
-
if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT)) {
char *full_name;
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);
+ ex_info = &amodule->ex_info [amodule->ex_info_offsets [method_index]];
+ jinfo = decode_exception_debug_info (amodule, 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);
+ mono_aot_lock ();
+
+ mono_jit_stats.methods_aot++;
+
+ amodule->methods_loaded [method_index / 32] |= 1 << (method_index % 32);
- init_plt (aot_module);
+ init_plt (amodule);
if (method && method->wrapper_type)
- g_hash_table_insert (aot_module->method_to_code, method, code);
+ g_hash_table_insert (amodule->method_to_code, method, code);
mono_aot_unlock ();
- if (!method && klass)
+ if (from_plt && klass && !klass->generic_container)
mono_runtime_class_init (mono_class_vtable (domain, klass));
return code;
cleanup:
/* FIXME: The space in domain->mp is wasted */
- if (aot_module->opts & MONO_OPT_SHARED)
+ if (amodule->opts & MONO_OPT_SHARED)
/* No need to cache patches */
mono_mempool_destroy (mp);
{
guint32 table_size, entry_size, hash;
guint32 *table, *entry;
- char *full_name = NULL;
+ char *name = NULL;
+ guint32 index;
+ static guint32 n_extra_decodes;
if (!amodule)
return 0xffffff;
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 {
- full_name = mono_method_full_name (method, TRUE);
- }
+ name = mono_aot_wrapper_name (method);
}
- if (method->wrapper_type)
- hash = g_str_hash (method->name) % table_size;
- else
- hash = 0 % table_size;
+ hash = mono_aot_method_hash (method) % table_size;
entry = &table [hash * entry_size];
- if (entry [0] != 0) {
- while (TRUE) {
- guint32 key = entry [0];
- guint32 value = entry [1];
- guint32 next = entry [entry_size - 1];
- MonoMethod *m;
- guint8 *p;
- int is_wrapper;
-
- // FIXME: Avoid fully decoding the method ref
- p = amodule->extra_method_info + key;
- is_wrapper = decode_value (p, &p);
- if (method->wrapper_type && is_wrapper) {
- if (!strcmp (full_name, (char*)p))
- return value;
- } else {
+ if (entry [0] == 0)
+ return 0xffffff;
+
+ index = 0xffffff;
+ while (TRUE) {
+ guint32 key = entry [0];
+ guint32 value = entry [1];
+ guint32 next = entry [entry_size - 1];
+ MonoMethod *m;
+ guint8 *p;
+ int is_wrapper_name;
+
+ p = amodule->extra_method_info + key;
+ is_wrapper_name = decode_value (p, &p);
+ if (is_wrapper_name) {
+ int wrapper_type = decode_value (p, &p);
+ if (wrapper_type == method->wrapper_type && !strcmp (name, (char*)p)) {
+ index = value;
+ break;
+ }
+ } else if (can_method_ref_match_method (amodule, p, method)) {
+ 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 == method)
- return value;
+ if (m) {
+ mono_aot_lock ();
+ g_hash_table_insert (amodule->method_ref_to_method, orig_p, m);
+ mono_aot_unlock ();
+ }
}
-
- if (next != 0) {
- entry = &table [next * entry_size];
- } else {
+ if (m == method) {
+ index = value;
break;
}
+
+ /* Special case: wrappers of shared generic methods */
+ if (m && method->wrapper_type && m->wrapper_type == m->wrapper_type &&
+ method->wrapper_type == MONO_WRAPPER_SYNCHRONIZED) {
+ MonoMethod *w1 = mono_marshal_method_from_wrapper (method);
+ MonoMethod *w2 = mono_marshal_method_from_wrapper (m);
+
+ if (w1->is_inflated && ((MonoMethodInflated *)w1)->declaring == w2) {
+ index = value;
+ break;
+ }
+ }
+
+ /* 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 (next != 0)
+ entry = &table [next * entry_size];
+ else
+ break;
}
- return 0xffffff;
+ g_free (name);
+ return index;
}
static void
return index;
}
+/*
+ * mono_aot_get_method:
+ *
+ * Return a pointer to the AOTed native code for METHOD if it can be found,
+ * NULL otherwise.
+ * On platforms with function pointers, this doesn't return a function pointer.
+ */
gpointer
mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
{
(method->flags & METHOD_ATTRIBUTE_ABSTRACT))
return NULL;
+ /*
+ * Use the original method instead of its invoke-with-check wrapper.
+ * This is not a problem when using full-aot, since it doesn't support
+ * remoting.
+ */
+ if (mono_aot_only && method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)
+ return mono_aot_get_method (domain, mono_marshal_method_from_wrapper (method));
+
g_assert (klass->inited);
/* Find method index */
IsGotEntryUserData *data = (IsGotEntryUserData*)user_data;
MonoAotModule *aot_module = (MonoAotModule*)value;
- if (aot_module->got && (data->addr >= (guint8*)(aot_module->got)) && (data->addr < (guint8*)(aot_module->got + aot_module->got_size)))
+ if (aot_module->got && (data->addr >= (guint8*)(aot_module->got)) && (data->addr < (guint8*)(aot_module->got + aot_module->info.got_size)))
data->res = TRUE;
}
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:
*
//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);
// FIXME: Error handling (how ?)
g_assert (res);
- target = mono_resolve_patch_target (NULL, mono_domain_get (), NULL, &ji, TRUE);
+ /*
+ * Avoid calling resolve_patch_target in the full-aot case if possible, since
+ * it would create a trampoline, and we don't need that.
+ * We could do this only if the method does not need the special handling
+ * in mono_magic_trampoline ().
+ */
+ if (mono_aot_only && ji.type == MONO_PATCH_INFO_METHOD && !ji.data.method->is_generic && !mono_method_check_context_used (ji.data.method) && !(ji.data.method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED) &&
+ !mono_method_needs_static_rgctx_invoke (ji.data.method, FALSE)) {
+ target = mono_jit_compile_method (ji.data.method);
+ } else {
+ 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);
- mono_arch_patch_plt_entry (plt_entry, target);
+ mono_arch_patch_plt_entry (plt_entry, module->got, NULL, target);
return target;
#else
* LOCKING: Assumes the AOT lock is held.
*/
static void
-init_plt (MonoAotModule *info)
+init_plt (MonoAotModule *amodule)
{
+#ifndef MONO_CROSS_COMPILE
+
#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;
+ guint8 *buf = amodule->plt;
+#elif defined(__x86_64__) || defined(__arm__) || defined(__mono_ppc__)
+ int i;
+ gpointer plt_0;
#endif
gpointer tramp;
- if (info->plt_inited)
+ if (amodule->plt_inited)
return;
- tramp = mono_create_specific_trampoline (info, MONO_TRAMPOLINE_AOT_PLT, mono_get_root_domain (), NULL);
+ tramp = mono_create_specific_trampoline (amodule, MONO_TRAMPOLINE_AOT_PLT, mono_get_root_domain (), NULL);
#ifdef __i386__
/* Initialize the first PLT entry */
- make_writable (info->plt, info->plt_end - info->plt);
+ make_writable (amodule->plt, amodule->plt_end - amodule->plt);
x86_jump_code (buf, tramp);
-#elif defined(__x86_64__) || defined(__arm__)
+#elif defined(__x86_64__) || defined(__arm__) || defined(__mono_ppc__)
/*
- * 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);
+ 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*)info->plt_jump_table)[0] = tramp;
- for (i = 1; i < n_entries; ++i)
+ ((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*)info->plt_jump_table)[i] = info->plt;
+ ((gpointer*)amodule->got)[amodule->info.plt_got_offset_base + i] = plt_0;
#else
g_assert_not_reached ();
#endif
- info->plt_inited = TRUE;
+ amodule->plt_inited = TRUE;
#endif
+
+#endif /* MONO_CROSS_COMPILE */
}
/*
mono_aot_get_plt_entry (guint8 *code)
{
MonoAotModule *aot_module = find_aot_module (code);
-#if defined(__arm__)
+#if defined(__arm__) || defined(__mono_ppc__)
guint32 ins;
#endif
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);
+
+ if ((target >= (guint8*)(aot_module->plt)) && (target < (guint8*)(aot_module->plt_end)))
+ return target;
+ }
#else
g_assert_not_reached ();
#endif
* Return the PLT info offset belonging to the plt entry called by CODE.
*/
guint32
-mono_aot_get_plt_info_offset (gssize *regs, guint8 *code)
+mono_aot_get_plt_info_offset (mgreg_t *regs, guint8 *code)
{
guint8 *plt_entry = mono_aot_get_plt_entry (code);
#elif defined(__x86_64__)
return *(guint32*)(plt_entry + 6);
#elif defined(__arm__)
- /* The offset is stored as the 5th word of the plt entry */
- return ((guint32*)plt_entry) [4];
+ /* 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
#else
g_assert_not_reached ();
return 0;
}
static gpointer
-load_named_code (MonoAotModule *amodule, const char *name)
+mono_create_ftnptr_malloc (guint8 *code)
+{
+#ifdef PPC_USES_FUNCTION_DESCRIPTOR
+ MonoPPCFunctionDescriptor *ftnptr = g_malloc0 (sizeof (MonoPPCFunctionDescriptor));
+
+ ftnptr->code = code;
+ ftnptr->toc = NULL;
+ ftnptr->env = NULL;
+
+ return ftnptr;
+#else
+ return code;
+#endif
+}
+
+/*
+ * load_function:
+ *
+ * Load the function named NAME from the aot image.
+ */
+static gpointer
+load_function (MonoAotModule *amodule, const char *name)
{
char *symbol;
guint8 *p;
- int n_patches, got_index, pindex;
+ int n_patches, pindex;
MonoMemPool *mp;
gpointer code;
mp = mono_mempool_new ();
- got_index = decode_value (p, &p);
-
- patches = load_patch_info (amodule, mp, n_patches, got_index, &got_slots, p, &p);
+ patches = load_patch_info (amodule, mp, n_patches, &got_slots, p, &p);
g_assert (patches);
for (pindex = 0; pindex < n_patches; ++pindex) {
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
+ * When this code is executed, the runtime may not be initalized yet, so
* resolve the patch info by hand.
*/
if (ji->type == MONO_PATCH_INFO_JIT_ICALL_ADDR) {
} 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);
} else if (strstr (ji->data.name, "specific_trampoline_lazy_fetch_") == ji->data.name) {
- guint32 slot = atoi (ji->data.name + strlen ("specific_trampoline_lazy_fetch_"));
+ /* 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);
+ target = mono_create_ftnptr_malloc (target);
+ } 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);
+ target = mono_create_ftnptr_malloc (target);
+ } 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);
+ target = mono_create_ftnptr_malloc (target);
+ } 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);
+ 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 {
fprintf (stderr, "Unknown relocation '%s'\n", ji->data.name);
g_assert_not_reached ();
* domain to be set.
*/
target = mono_resolve_patch_target (NULL, NULL, code, ji, FALSE);
+ g_assert (target);
}
amodule->got [got_slots [pindex]] = target;
/*
* Return the piece of code identified by NAME from the mscorlib AOT file.
+ * On ppc64, this returns a function descriptor.
*/
gpointer
mono_aot_get_named_code (const char *name)
amodule = image->aot_module;
g_assert (amodule);
- return load_named_code (amodule, name);
+ return mono_create_ftnptr_malloc (load_function (amodule, name));
}
-/*
- * Return a specific trampoline from the AOT file.
- */
-gpointer
-mono_aot_create_specific_trampoline (MonoImage *image, gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len)
+/* Return a given kind of trampoline */
+static gpointer
+get_numerous_trampoline (MonoAotTrampoline tramp_type, int n_got_slots, MonoAotModule **out_amodule, guint32 *got_offset, guint32 *out_tramp_size)
{
MonoAotModule *amodule;
int index, tramp_size;
- guint8 *code, *tramp;
- static gpointer generic_trampolines [MONO_TRAMPOLINE_NUM];
+ MonoImage *image;
/* Currently, we keep all trampolines in the mscorlib AOT image */
image = mono_defaults.corlib;
amodule = image->aot_module;
g_assert (amodule);
- if (amodule->trampoline_index == amodule->num_trampolines)
- g_error ("Ran out of trampolines in '%s' (%d)\n", image->name, amodule->num_trampolines);
+ *out_amodule = amodule;
+
+ if (amodule->trampoline_index [tramp_type] == amodule->info.num_trampolines [tramp_type])
+ g_error ("Ran out of trampolines of type %d in '%s' (%d)\n", tramp_type, image->name, amodule->info.num_trampolines [tramp_type]);
- index = amodule->trampoline_index ++;
+ index = amodule->trampoline_index [tramp_type] ++;
mono_aot_unlock ();
+ *got_offset = amodule->info.trampoline_got_offset_base [tramp_type] + (index * n_got_slots);
+
+ tramp_size = amodule->info.trampoline_size [tramp_type];
+
+ if (out_tramp_size)
+ *out_tramp_size = tramp_size;
+
+ return amodule->trampolines [tramp_type] + (index * tramp_size);
+}
+
+/*
+ * Return a specific trampoline from the AOT file.
+ */
+gpointer
+mono_aot_create_specific_trampoline (MonoImage *image, gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len)
+{
+ MonoAotModule *amodule;
+ guint32 got_offset, tramp_size;
+ guint8 *code, *tramp;
+ static gpointer generic_trampolines [MONO_TRAMPOLINE_NUM];
+ static gboolean inited;
+ static guint32 num_trampolines;
+
+ if (!inited) {
+ mono_aot_lock ();
+
+ if (!inited) {
+ mono_counters_register ("Specific trampolines", MONO_COUNTER_JIT | MONO_COUNTER_INT, &num_trampolines);
+ inited = TRUE;
+ }
+
+ mono_aot_unlock ();
+ }
+
+ num_trampolines ++;
+
if (!generic_trampolines [tramp_type]) {
char *symbol;
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;
+ code = get_numerous_trampoline (MONO_AOT_TRAMP_SPECIFIC, 2, &amodule, &got_offset, &tramp_size);
-#ifdef __x86_64__
- tramp_size = 16;
-#elif defined(__arm__)
- tramp_size = 28;
-#else
- tramp_size = -1;
- g_assert_not_reached ();
-#endif
+ amodule->got [got_offset] = tramp;
+ amodule->got [got_offset + 1] = arg1;
- code = amodule->trampolines + (index * tramp_size);
if (code_len)
*code_len = tramp_size;
return code;
}
+gpointer
+mono_aot_get_static_rgctx_trampoline (gpointer ctx, gpointer addr)
+{
+ MonoAotModule *amodule;
+ guint8 *code;
+ guint32 got_offset;
+
+ code = get_numerous_trampoline (MONO_AOT_TRAMP_STATIC_RGCTX, 2, &amodule, &got_offset, NULL);
+
+ amodule->got [got_offset] = ctx;
+ amodule->got [got_offset + 1] = addr;
+
+ /* The caller expects an ftnptr */
+ return mono_create_ftnptr (mono_domain_get (), code);
+}
+
gpointer
mono_aot_get_unbox_trampoline (MonoMethod *method)
{
char *symbol;
gpointer code;
- amodule = method->klass->image->aot_module;
- g_assert (amodule);
+ if (method->is_inflated && !mono_method_is_generic_sharable_impl (method, FALSE)) {
+ guint32 index = find_extra_method (method, &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);
- code = load_named_code (amodule, symbol);
+ symbol = g_strdup_printf ("ut_%d", method_index);
+ }
+ code = load_function (amodule, symbol);
g_free (symbol);
- return code;
+
+ /* The caller expects an ftnptr */
+ return mono_create_ftnptr (mono_domain_get (), code);
}
gpointer
gpointer code;
symbol = g_strdup_printf ("rgctx_fetch_trampoline_%u", slot);
- code = load_named_code (mono_defaults.corlib->aot_module, symbol);
+ code = load_function (mono_defaults.corlib->aot_module, 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_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem **imt_entries, int count, gpointer fail_tramp)
{
- return n_pagefaults;
+ guint32 got_offset;
+ gpointer code;
+ gpointer *buf;
+ int i;
+ MonoAotModule *amodule;
+
+ code = get_numerous_trampoline (MONO_AOT_TRAMP_IMT_THUNK, 1, &amodule, &got_offset, NULL);
+
+ /* Save the entries into an array */
+ buf = mono_domain_alloc (domain, (count + 1) * 2 * sizeof (gpointer));
+ for (i = 0; i < count; ++i) {
+ MonoIMTCheckItem *item = imt_entries [i];
+
+ g_assert (item->key);
+ /* FIXME: */
+ g_assert (!item->has_target_code);
+
+ buf [(i * 2)] = item->key;
+ buf [(i * 2) + 1] = &(vtable->vtable [item->value.vtable_slot]);
+ }
+ buf [(count * 2)] = NULL;
+ buf [(count * 2) + 1] = fail_tramp;
+
+ amodule->got [got_offset] = buf;
+
+ return code;
}
#else
return NULL;
}
-gboolean
-mono_aot_is_pagefault (void *ptr)
+guint8*
+mono_aot_get_plt_entry (guint8 *code)
{
- return FALSE;
+ return NULL;
}
-void
-mono_aot_set_make_unreadable (gboolean unreadable)
+gpointer
+mono_aot_plt_resolve (gpointer aot_module, guint32 plt_info_offset, guint8 *code)
{
+ return NULL;
}
-guint32
-mono_aot_get_n_pagefaults (void)
+gpointer
+mono_aot_get_method_from_vt_slot (MonoDomain *domain, MonoVTable *vtable, int slot)
{
- return 0;
+ return NULL;
}
-void
-mono_aot_handle_pagefault (void *ptr)
+guint32
+mono_aot_get_plt_info_offset (mgreg_t *regs, guint8 *code)
{
+ g_assert_not_reached ();
+
+ return 0;
}
-guint8*
-mono_aot_get_plt_entry (guint8 *code)
+gpointer
+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_plt_resolve (gpointer aot_module, guint32 plt_info_offset, guint8 *code)
+mono_aot_get_static_rgctx_trampoline (gpointer ctx, gpointer addr)
{
+ g_assert_not_reached ();
return NULL;
}
gpointer
-mono_aot_get_method_from_vt_slot (MonoDomain *domain, MonoVTable *vtable, int slot)
+mono_aot_get_named_code (const char *name)
{
+ g_assert_not_reached ();
return NULL;
}
gpointer
-mono_aot_create_specific_trampolines (gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len)
+mono_aot_get_unbox_trampoline (MonoMethod *method)
{
g_assert_not_reached ();
return NULL;
}
gpointer
-mono_aot_get_named_code (char *name)
+mono_aot_get_lazy_fetch_trampoline (guint32 slot)
{
g_assert_not_reached ();
return NULL;
}
gpointer
-mono_aot_get_unbox_trampoline (MonoMethod *method)
+mono_aot_get_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem **imt_entries, int count, gpointer fail_tramp)
+{
+ g_assert_not_reached ();
+ return NULL;
+}
+
+guint8*
+mono_aot_get_unwind_info (MonoJitInfo *ji, guint32 *unwind_info_len)
{
g_assert_not_reached ();
return NULL;
projects / mono.git / blobdiff