static GHashTable *class_init_hash_addr = NULL;
static GHashTable *rgctx_lazy_fetch_trampoline_hash = NULL;
static GHashTable *rgctx_lazy_fetch_trampoline_hash_addr = NULL;
-static guint32 trampoline_calls;
+static guint32 trampoline_calls, jit_trampolines, unbox_trampolines, static_rgctx_trampolines;
#define mono_trampolines_lock() EnterCriticalSection (&trampolines_mutex)
#define mono_trampolines_unlock() LeaveCriticalSection (&trampolines_mutex)
static CRITICAL_SECTION trampolines_mutex;
static gpointer
-get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *m, gpointer addr, gboolean need_rgctx_tramp)
+get_unbox_trampoline (MonoMethod *m, gpointer addr, gboolean need_rgctx_tramp)
{
if (mono_aot_only) {
if (need_rgctx_tramp)
else
return mono_aot_get_unbox_trampoline (m);
} else {
- return mono_arch_get_unbox_trampoline (gsctx, m, addr);
+ unbox_trampolines ++;
+ return mono_arch_get_unbox_trampoline (m, addr);
}
}
g_hash_table_insert (domain_jit_info (domain)->static_rgctx_trampoline_hash, info, res);
mono_domain_unlock (domain);
+ static_rgctx_trampolines ++;
+
return res;
}
#else
}
#endif
-gpointer*
-mono_get_vcall_slot_addr (guint8* code, mgreg_t *regs)
-{
- gpointer vt;
- int displacement;
- vt = mono_arch_get_vcall_slot (code, regs, &displacement);
- if (!vt)
- return NULL;
- return (gpointer*)((char*)vt + displacement);
-}
-
#ifdef MONO_ARCH_HAVE_IMT
+/*
+ * Either IMPL_METHOD or AOT_ADDR will be set on return.
+ */
static gpointer*
-mono_convert_imt_slot_to_vtable_slot (gpointer* slot, mgreg_t *regs, guint8 *code, MonoMethod *method, MonoMethod **impl_method, gboolean *need_rgctx_tramp, gboolean *variance_used)
+mono_convert_imt_slot_to_vtable_slot (gpointer* slot, mgreg_t *regs, guint8 *code, MonoMethod *method, MonoMethod **impl_method, gboolean *need_rgctx_tramp, gboolean *variance_used, gpointer *aot_addr)
{
- MonoObject *this_argument = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (method), regs, code);
+ MonoObject *this_argument = mono_arch_get_this_arg_from_call (regs, code);
MonoVTable *vt = this_argument->vtable;
int displacement = slot - ((gpointer*)vt);
return slot;
} else {
MonoMethod *imt_method = mono_arch_find_imt_method (regs, code);
+ MonoMethod *impl;
int interface_offset;
int imt_slot = MONO_IMT_SIZE + displacement;
}
mono_vtable_build_imt_slot (vt, mono_method_get_imt_slot (imt_method));
- if (impl_method) {
- MonoMethod *impl;
+ if (imt_method->is_inflated && ((MonoMethodInflated*)imt_method)->context.method_inst) {
+ MonoGenericContext context = { NULL, NULL };
- if (imt_method->is_inflated && ((MonoMethodInflated*)imt_method)->context.method_inst) {
- MonoGenericContext context = { NULL, NULL };
+ /*
+ * Generic virtual method, imt_method contains the inflated interface
+ * method, need to get the inflated impl method.
+ */
+ /* imt_method->slot might not be set */
+ impl = mono_class_get_vtable_entry (vt->klass, interface_offset + mono_method_get_declaring_generic_method (imt_method)->slot);
- /*
- * Generic virtual method, imt_method contains the inflated interface
- * method, need to get the inflated impl method.
- */
- /* imt_method->slot might not be set */
- impl = mono_class_get_vtable_entry (vt->klass, interface_offset + mono_method_get_declaring_generic_method (imt_method)->slot);
-
- if (impl->klass->generic_class)
- context.class_inst = impl->klass->generic_class->context.class_inst;
- context.method_inst = ((MonoMethodInflated*)imt_method)->context.method_inst;
- impl = mono_class_inflate_generic_method (impl, &context);
- } else {
+ if (impl->klass->generic_class)
+ context.class_inst = impl->klass->generic_class->context.class_inst;
+ context.method_inst = ((MonoMethodInflated*)imt_method)->context.method_inst;
+ impl = mono_class_inflate_generic_method (impl, &context);
+ } else {
+ /* Avoid loading metadata or creating a generic vtable if possible */
+ if (!vt->klass->valuetype)
+ *aot_addr = mono_aot_get_method_from_vt_slot (mono_domain_get (), vt, interface_offset + mono_method_get_vtable_slot (imt_method));
+ else
+ *aot_addr = NULL;
+ if (*aot_addr)
+ impl = NULL;
+ else
impl = mono_class_get_vtable_entry (vt->klass, interface_offset + mono_method_get_vtable_slot (imt_method));
- }
+ }
- if (mono_method_needs_static_rgctx_invoke (impl, FALSE))
- *need_rgctx_tramp = TRUE;
+ if (impl && mono_method_needs_static_rgctx_invoke (impl, FALSE))
+ *need_rgctx_tramp = TRUE;
- *impl_method = impl;
+ *impl_method = impl;
#if DEBUG_IMT
printf ("mono_convert_imt_slot_to_vtable_slot: method = %s.%s.%s, imt_method = %s.%s.%s\n",
method->klass->name_space, method->klass->name, method->name,
imt_method->klass->name_space, imt_method->klass->name, imt_method->name);
#endif
- }
+
g_assert (imt_slot < MONO_IMT_SIZE);
if (vt->imt_collisions_bitmap & (1 << imt_slot)) {
int slot = mono_method_get_vtable_index (imt_method);
* from JITted and LLVM compiled code.
*/
static gpointer
-common_call_trampoline (mgreg_t *regs, guint8 *code, gpointer arg, guint8* tramp, MonoVTable *vt, gpointer *vtable_slot, gboolean need_rgctx_tramp)
+common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tramp, MonoVTable *vt, gpointer *vtable_slot, gboolean need_rgctx_tramp)
{
gpointer addr, compiled_method;
gboolean generic_shared = FALSE;
- MonoMethod *m;
MonoMethod *declaring = NULL;
MonoMethod *generic_virtual = NULL, *variant_iface = NULL;
int context_used;
gboolean virtual, proxy = FALSE, variance_used = FALSE;
- gpointer *orig_vtable_slot;
+ gpointer *orig_vtable_slot, *vtable_slot_to_patch = NULL;
MonoJitInfo *ji = NULL;
- /* The first case is for !llvm, the second is for llvm */
- virtual = (arg == MONO_FAKE_VTABLE_METHOD) || ((gpointer)vtable_slot > (gpointer)vt);
-
- m = arg;
+ virtual = (gpointer)vtable_slot > (gpointer)vt;
orig_vtable_slot = vtable_slot;
+ vtable_slot_to_patch = vtable_slot;
- if (m == MONO_FAKE_VTABLE_METHOD) {
- int displacement;
- if (!vt) {
- int i;
- MonoJitInfo *ji;
-
- ji = mono_jit_info_table_find (mono_domain_get (), (char*)code);
- if (ji)
- printf ("Caller: %s\n", mono_method_full_name (ji->method, TRUE));
- /* Print some debug info */
- for (i = 0; i < 32; ++i)
- printf ("0x%x ", code [-32 + i]);
- printf ("\n");
- g_assert (vt);
- }
- displacement = (guint8*)vtable_slot - (guint8*)vt;
- if (displacement > 0) {
- int slot = (displacement - G_STRUCT_OFFSET (MonoVTable, vtable)) / sizeof (gpointer);
- g_assert (slot >= 0);
-
- /* Avoid loading metadata or creating a generic vtable if possible */
- addr = mono_aot_get_method_from_vt_slot (mono_domain_get (), vt, slot);
- if (addr)
- addr = mono_create_ftnptr (mono_domain_get (), addr);
- if (addr && !vt->klass->valuetype) {
- vtable_slot = mono_get_vcall_slot_addr (code, regs);
- if (mono_aot_is_got_entry (code, (guint8*)vtable_slot) || mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot)) {
- *vtable_slot = mono_get_addr_from_ftnptr (addr);
- }
-
- return addr;
- }
-
- /*
- * Bug #616463 (see
- * is_generic_method_definition() above) also
- * goes away if we do a
- * mono_class_setup_vtable (vt->klass) here,
- * because we then inflate the method
- * correctly, put it in the cache, and the
- * "wrong" inflation invocation still looks up
- * the correctly inflated method.
- *
- * The hack above seems more stable and
- * trustworthy.
- */
- m = mono_class_get_vtable_entry (vt->klass, slot);
- if (mono_method_needs_static_rgctx_invoke (m, FALSE))
- need_rgctx_tramp = TRUE;
-
- /*g_print ("%s with disp %d: %s at %p\n", vt->klass->name, displacement, m->name, code);*/
- } else {
- /* We got here from an interface method: redirect to IMT handling */
- m = MONO_FAKE_IMT_METHOD;
- /*g_print ("vtable with disp %d at %p\n", displacement, code);*/
- }
- }
-
- /* this is the IMT trampoline */
#ifdef MONO_ARCH_HAVE_IMT
- if (m == MONO_FAKE_IMT_METHOD) {
- MonoMethod *impl_method;
+ /* IMT call */
+ if (vt && (gpointer)vtable_slot < (gpointer)vt) {
+ MonoMethod *impl_method = NULL;
MonoObject *this_arg;
/* we get the interface method because mono_convert_imt_slot_to_vtable_slot ()
vtable_slot = orig_vtable_slot;
g_assert (vtable_slot);
- this_arg = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (m), regs, code);
+ this_arg = mono_arch_get_this_arg_from_call (regs, code);
if (this_arg->vtable->klass == mono_defaults.transparent_proxy_class) {
/* Use the slow path for now */
proxy = TRUE;
m = mono_object_get_virtual_method (this_arg, m);
+ vtable_slot_to_patch = NULL;
} else {
- vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, &impl_method, &need_rgctx_tramp, &variance_used);
+ addr = NULL;
+ vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, &impl_method, &need_rgctx_tramp, &variance_used, &addr);
+ /* This is the vcall slot which gets called through the IMT thunk */
+ vtable_slot_to_patch = vtable_slot;
/* mono_convert_imt_slot_to_vtable_slot () also gives us the method that is supposed
* to be called, so we compile it and go ahead as usual.
*/
} else if (variance_used && mono_class_has_variant_generic_params (m->klass)) {
variant_iface = m;
}
+
+ if (addr && !generic_virtual && !variant_iface) {
+ /*
+ * We found AOT compiled code for the method, skip the rest.
+ */
+ if (mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot))
+ *vtable_slot = addr;
+
+ return mono_create_ftnptr (mono_domain_get (), addr);
+ }
+
m = impl_method;
}
}
#endif
} else {
#ifdef MONO_ARCH_HAVE_IMT
- MonoObject *this_argument = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (m), regs, code);
+ MonoObject *this_argument = mono_arch_get_this_arg_from_call (regs, code);
vt = this_argument->vtable;
vtable_slot = orig_vtable_slot;
ji = NULL;
/* Avoid recursion */
- if (!(ji && ji->method->wrapper_type == MONO_WRAPPER_SYNCHRONIZED))
+ if (!(ji && ji->method->wrapper_type == MONO_WRAPPER_SYNCHRONIZED)) {
m = mono_marshal_get_synchronized_wrapper (m);
+ need_rgctx_tramp = FALSE;
+ }
}
/* Calls made through delegates on platforms without delegate trampolines */
g_assert (vtable_slot);
if (vt->klass->valuetype) /*FIXME is this required variant iface?*/
- addr = get_unbox_trampoline (mono_get_generic_context_from_code (code), m, addr, need_rgctx_tramp);
+ addr = get_unbox_trampoline (m, addr, need_rgctx_tramp);
mono_method_add_generic_virtual_invocation (mono_domain_get (),
vt, vtable_slot,
vtable_slot = orig_vtable_slot;
if (vtable_slot) {
- gboolean variance_used = FALSE;
if (m->klass->valuetype)
- addr = get_unbox_trampoline (mono_get_generic_context_from_code (code), m, addr, need_rgctx_tramp);
- g_assert (*vtable_slot);
+ addr = get_unbox_trampoline (m, addr, need_rgctx_tramp);
- if (!proxy && (mono_aot_is_got_entry (code, (guint8*)vtable_slot) || mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot))) {
-#ifdef MONO_ARCH_HAVE_IMT
- vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, NULL, &need_rgctx_tramp, &variance_used);
-#endif
- *vtable_slot = mono_get_addr_from_ftnptr (addr);
+ if (vtable_slot_to_patch && (mono_aot_is_got_entry (code, (guint8*)vtable_slot_to_patch) || mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot_to_patch))) {
+ g_assert (*vtable_slot_to_patch);
+ *vtable_slot_to_patch = mono_get_addr_from_ftnptr (addr);
}
}
else {
{
MonoJitInfo *target_ji =
mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (compiled_method));
+ if (!target_ji)
+ target_ji = mono_jit_info_table_find (mono_get_root_domain (), mono_get_addr_from_ftnptr (compiled_method));
if (!ji)
ji = mono_jit_info_table_find (mono_domain_get (), (char*)code);
+ if (!ji)
+ ji = mono_jit_info_table_find (mono_get_root_domain (), (char*)code);
if (mono_method_same_domain (ji, target_ji))
mono_arch_patch_callsite (ji->code_start, code, addr);
/**
* mono_magic_trampoline:
*
- * This trampoline handles calls from JITted code.
+ * This trampoline handles normal calls from JITted code.
*/
gpointer
mono_magic_trampoline (mgreg_t *regs, guint8 *code, gpointer arg, guint8* tramp)
{
- gpointer *vtable_slot;
- int displacement;
- MonoVTable *vt;
-
trampoline_calls ++;
- if (code && !mono_use_llvm)
- vt = mono_arch_get_vcall_slot (code, regs, &displacement);
- else
- vt = NULL;
- if (vt)
- vtable_slot = (gpointer*)((char*)vt + displacement);
- else
- vtable_slot = NULL;
-
- return common_call_trampoline (regs, code, arg, tramp, vt, vtable_slot, FALSE);
+ return common_call_trampoline (regs, code, arg, tramp, NULL, NULL, FALSE);
}
-#ifdef MONO_ARCH_LLVM_SUPPORTED
/*
- * mono_llvm_vcall_trampoline:
+ * mono_vcall_trampoline:
*
- * This trampoline handles virtual calls when using LLVM.
+ * This trampoline handles virtual calls.
*/
static gpointer
-mono_llvm_vcall_trampoline (mgreg_t *regs, guint8 *code, int slot, guint8 *tramp)
+mono_vcall_trampoline (mgreg_t *regs, guint8 *code, int slot, guint8 *tramp)
{
MonoObject *this;
MonoVTable *vt;
gpointer *vtable_slot;
MonoMethod *m;
- gboolean need_rgctx_tramp;
+ gboolean need_rgctx_tramp = FALSE;
+ gpointer addr;
trampoline_calls ++;
* We need to obtain the following pieces of information:
* - the method which needs to be compiled.
* - the vtable slot.
- * Since disassembly is impossible with LLVM, we use one vtable trampoline per
- * vtable slot index, and obtain the method using this index + the this argument.
- * This requires us to always pass this as the first argument, regardless of the
- * signature.
+ * We use one vtable trampoline per vtable slot index, so we need only the vtable,
+ * the other two can be computed from the vtable + the slot index.
*/
#ifndef MONO_ARCH_THIS_AS_FIRST_ARG
- NOT_IMPLEMENTED;
+ /* All architectures should support this */
+ g_assert_not_reached ();
#endif
- this = mono_arch_get_this_arg_from_call (NULL, NULL, regs, code);
+ /*
+ * Obtain the vtable from the 'this' arg.
+ */
+ this = mono_arch_get_this_arg_from_call (regs, code);
g_assert (this);
vt = this->vtable;
- if (slot < 0) {
- m = MONO_FAKE_IMT_METHOD;
- need_rgctx_tramp = FALSE;
- vtable_slot = &(((gpointer*)vt) [slot]);
- } else {
+ if (slot >= 0) {
+ /* Normal virtual call */
+ vtable_slot = &(vt->vtable [slot]);
+
+ /* Avoid loading metadata or creating a generic vtable if possible */
+ addr = mono_aot_get_method_from_vt_slot (mono_domain_get (), vt, slot);
+ if (addr && !vt->klass->valuetype) {
+ if (mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot))
+ *vtable_slot = addr;
+
+ return mono_create_ftnptr (mono_domain_get (), addr);
+ }
- m = mono_class_get_vtable_entry (this->vtable->klass, slot);
+ /*
+ * Bug #616463 (see
+ * is_generic_method_definition() above) also
+ * goes away if we do a
+ * mono_class_setup_vtable (vt->klass) here,
+ * because we then inflate the method
+ * correctly, put it in the cache, and the
+ * "wrong" inflation invocation still looks up
+ * the correctly inflated method.
+ *
+ * The hack above seems more stable and
+ * trustworthy.
+ */
+ m = mono_class_get_vtable_entry (vt->klass, slot);
need_rgctx_tramp = mono_method_needs_static_rgctx_invoke (m, 0);
+ } else {
+ /* IMT call */
+ vtable_slot = &(((gpointer*)vt) [slot]);
- vtable_slot = &(vt->vtable [slot]);
+ m = NULL;
+ need_rgctx_tramp = FALSE;
}
return common_call_trampoline (regs, code, m, tramp, vt, vtable_slot, need_rgctx_tramp);
}
-#endif
gpointer
mono_generic_virtual_remoting_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8 *tramp)
guint32 token;
MonoMethod *method = NULL;
gpointer addr;
- gpointer *vtable_slot;
guint8 *plt_entry;
trampoline_calls ++;
addr = mono_create_ftnptr (mono_domain_get (), addr);
- vtable_slot = mono_get_vcall_slot_addr (code, regs);
- g_assert (!vtable_slot);
-
/* This is a normal call through a PLT entry */
plt_entry = mono_aot_get_plt_entry (code);
g_assert (plt_entry);
MonoMethod *method = NULL;
gboolean multicast, callvirt = FALSE;
gboolean need_rgctx_tramp = FALSE;
+ gboolean enable_caching = TRUE;
MonoMethod *invoke = tramp_data [0];
guint8 *impl_this = tramp_data [1];
guint8 *impl_nothis = tramp_data [2];
trampoline_calls ++;
/* Obtain the delegate object according to the calling convention */
-
- /*
- * Avoid calling mono_get_generic_context_from_code () now since it is expensive,
- * get_this_arg_from_call will call it if needed.
- */
- delegate = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (invoke), regs, code);
+ delegate = mono_arch_get_this_arg_from_call (regs, code);
if (delegate->method) {
method = delegate->method;
mono_error_raise_exception (&err);
callvirt = !delegate->target && sig->hasthis;
+ if (delegate->target &&
+ method->flags & METHOD_ATTRIBUTE_VIRTUAL &&
+ method->flags & METHOD_ATTRIBUTE_ABSTRACT &&
+ method->klass->flags & TYPE_ATTRIBUTE_ABSTRACT) {
+ method = mono_object_get_virtual_method (delegate->target, method);
+ enable_caching = FALSE;
+ }
}
if (method && method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
*/
if (method && !callvirt) {
/* Avoid the overhead of looking up an already compiled method if possible */
- if (delegate->method_code && *delegate->method_code) {
+ if (enable_caching && delegate->method_code && *delegate->method_code) {
delegate->method_ptr = *delegate->method_code;
} else {
delegate->method_ptr = mono_compile_method (method);
if (need_rgctx_tramp)
delegate->method_ptr = mono_create_static_rgctx_trampoline (method, delegate->method_ptr);
- if (delegate->method_code)
+ if (enable_caching && delegate->method_code)
*delegate->method_code = delegate->method_ptr;
mono_debugger_trampoline_compiled (NULL, method, delegate->method_ptr);
}
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
gpointer resume_ip = jit_tls->handler_block_return_address;
- memcpy (&ctx, &jit_tls->ex_ctx, sizeof (MonoContext));
+ memcpy (&ctx, &jit_tls->handler_block_context, sizeof (MonoContext));
MONO_CONTEXT_SET_IP (&ctx, jit_tls->handler_block_return_address);
jit_tls->handler_block_return_address = NULL;
return mono_monitor_enter_trampoline;
case MONO_TRAMPOLINE_MONITOR_EXIT:
return mono_monitor_exit_trampoline;
-#ifdef MONO_ARCH_LLVM_SUPPORTED
- case MONO_TRAMPOLINE_LLVM_VCALL:
- return mono_llvm_vcall_trampoline;
-#endif
+ case MONO_TRAMPOLINE_VCALL:
+ return mono_vcall_trampoline;
#ifdef MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD
case MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD:
return mono_handler_block_guard_trampoline;
code = mono_arch_create_generic_trampoline (tramp_type, &info, FALSE);
if (info) {
- mono_save_trampoline_xdebug_info (info->name, info->code, info->code_size, info->unwind_ops);
+ mono_save_trampoline_xdebug_info (info);
+ if (mono_jit_map_is_enabled ())
+ mono_emit_jit_tramp (info->code, info->code_size, info->name);
mono_tramp_info_free (info);
}
mono_trampoline_code [MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING] = create_trampoline_code (MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING);
mono_trampoline_code [MONO_TRAMPOLINE_MONITOR_ENTER] = create_trampoline_code (MONO_TRAMPOLINE_MONITOR_ENTER);
mono_trampoline_code [MONO_TRAMPOLINE_MONITOR_EXIT] = create_trampoline_code (MONO_TRAMPOLINE_MONITOR_EXIT);
-#ifdef MONO_ARCH_LLVM_SUPPORTED
- mono_trampoline_code [MONO_TRAMPOLINE_LLVM_VCALL] = create_trampoline_code (MONO_TRAMPOLINE_LLVM_VCALL);
-#endif
+ mono_trampoline_code [MONO_TRAMPOLINE_VCALL] = create_trampoline_code (MONO_TRAMPOLINE_VCALL);
#ifdef MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD
mono_trampoline_code [MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD] = create_trampoline_code (MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD);
mono_create_handler_block_trampoline ();
#endif
mono_counters_register ("Calls to trampolines", MONO_COUNTER_JIT | MONO_COUNTER_INT, &trampoline_calls);
+ mono_counters_register ("JIT trampolines", MONO_COUNTER_JIT | MONO_COUNTER_INT, &jit_trampolines);
+ mono_counters_register ("Unbox trampolines", MONO_COUNTER_JIT | MONO_COUNTER_INT, &unbox_trampolines);
+ mono_counters_register ("Static rgctx trampolines", MONO_COUNTER_JIT | MONO_COUNTER_INT, &static_rgctx_trampolines);
}
void
{
if (class_init_hash_addr)
g_hash_table_destroy (class_init_hash_addr);
+ if (rgctx_lazy_fetch_trampoline_hash)
+ g_hash_table_destroy (rgctx_lazy_fetch_trampoline_hash);
+ if (rgctx_lazy_fetch_trampoline_hash_addr)
+ g_hash_table_destroy (rgctx_lazy_fetch_trampoline_hash_addr);
DeleteCriticalSection (&trampolines_mutex);
}
{
#ifdef MONO_ARCH_VTABLE_REG
static gpointer code;
+ MonoTrampInfo *info;
mono_trampolines_lock ();
if (mono_aot_only)
/* get_named_code () might return an ftnptr, but our caller expects a direct pointer */
code = mono_get_addr_from_ftnptr (mono_aot_get_trampoline ("generic_class_init_trampoline"));
- else
- code = mono_arch_create_generic_class_init_trampoline (NULL, FALSE);
+ else {
+ code = mono_arch_create_generic_class_init_trampoline (&info, FALSE);
+
+ if (info) {
+ mono_save_trampoline_xdebug_info (info);
+ if (mono_jit_map_is_enabled ())
+ mono_emit_jit_tramp (info->code, info->code_size, info->name);
+ mono_tramp_info_free (info);
+ }
+ }
}
mono_trampolines_unlock ();
g_hash_table_insert (domain_jit_info (domain)->jit_trampoline_hash, method, tramp);
mono_domain_unlock (domain);
- mono_jit_stats.method_trampolines++;
+ jit_trampolines++;
return tramp;
}
tramp = mono_create_specific_trampoline (start, MONO_TRAMPOLINE_AOT, domain, NULL);
- mono_jit_stats.method_trampolines++;
+ jit_trampolines++;
return tramp;
}
{
static gboolean inited = FALSE;
static int num_trampolines = 0;
+ MonoTrampInfo *info;
gpointer tramp, ptr;
if (tramp)
return tramp;
- tramp = mono_arch_create_rgctx_lazy_fetch_trampoline (offset, NULL, FALSE);
+ tramp = mono_arch_create_rgctx_lazy_fetch_trampoline (offset, &info, FALSE);
+ if (info) {
+ mono_save_trampoline_xdebug_info (info);
+ if (mono_jit_map_is_enabled ())
+ mono_emit_jit_tramp (info->code, info->code_size, info->name);
+ mono_tramp_info_free (info);
+ }
ptr = mono_create_ftnptr (mono_get_root_domain (), tramp);
mono_trampolines_lock ();
mono_create_monitor_enter_trampoline (void)
{
static gpointer code;
+ MonoTrampInfo *info;
if (mono_aot_only) {
if (!code)
#ifdef MONO_ARCH_MONITOR_OBJECT_REG
mono_trampolines_lock ();
- if (!code)
- code = mono_arch_create_monitor_enter_trampoline (NULL, FALSE);
+ if (!code) {
+ code = mono_arch_create_monitor_enter_trampoline (&info, FALSE);
+ if (info) {
+ mono_save_trampoline_xdebug_info (info);
+ if (mono_jit_map_is_enabled ())
+ mono_emit_jit_tramp (info->code, info->code_size, info->name);
+ mono_tramp_info_free (info);
+ }
+ }
mono_trampolines_unlock ();
#else
mono_create_monitor_exit_trampoline (void)
{
static gpointer code;
+ MonoTrampInfo *info;
if (mono_aot_only) {
if (!code)
#ifdef MONO_ARCH_MONITOR_OBJECT_REG
mono_trampolines_lock ();
- if (!code)
- code = mono_arch_create_monitor_exit_trampoline (NULL, FALSE);
+ if (!code) {
+ code = mono_arch_create_monitor_exit_trampoline (&info, FALSE);
+ if (info) {
+ mono_save_trampoline_xdebug_info (info);
+ if (mono_jit_map_is_enabled ())
+ mono_emit_jit_tramp (info->code, info->code_size, info->name);
+ mono_tramp_info_free (info);
+ }
+ }
mono_trampolines_unlock ();
#else
}
#ifdef MONO_ARCH_LLVM_SUPPORTED
-/*
- * mono_create_llvm_vcall_trampoline:
- *
- * LLVM emits code for virtual calls which mono_get_vcall_slot is unable to
- * decode, i.e. only the final branch address is available:
- * mov <offset>(%rax), %rax
- * <random code inserted by instruction scheduling>
- * call *%rax
- *
- * To work around this problem, we don't use the common vtable trampoline when
- * llvm is enabled. Instead, we use one trampoline per method.
- */
-gpointer
-mono_create_llvm_vcall_trampoline (MonoMethod *method)
-{
- MonoDomain *domain;
- gpointer res;
-
- domain = mono_domain_get ();
-
- mono_domain_lock (domain);
- res = g_hash_table_lookup (domain_jit_info (domain)->llvm_vcall_trampoline_hash, method);
- mono_domain_unlock (domain);
- if (res)
- return res;
-
- res = mono_create_specific_trampoline (method, MONO_TRAMPOLINE_LLVM_VCALL, domain, NULL);
-
- mono_domain_lock (domain);
- g_hash_table_insert (domain_jit_info (domain)->llvm_vcall_trampoline_hash, method, res);
- mono_domain_unlock (domain);
-
- return res;
-}
-
/*
* mono_create_llvm_imt_trampoline:
*
mono_trampolines_unlock ();
return offset;
}
+
+static const char*tramp_names [MONO_TRAMPOLINE_NUM] = {
+ "jit",
+ "jump",
+ "class_init",
+ "generic_class_init",
+ "rgctx_lazy_fetch",
+ "aot",
+ "aot_plt",
+ "delegate",
+ "restore_stack_prot",
+ "generic_virtual_remoting",
+ "monitor_enter",
+ "monitor_exit",
+ "vcall",
+#ifdef MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD
+ "handler_block_guard"
+#endif
+};
+
+/*
+ * mono_get_generic_trampoline_name:
+ *
+ * Returns a pointer to malloc-ed memory.
+ */
+char*
+mono_get_generic_trampoline_name (MonoTrampolineType tramp_type)
+{
+ return g_strdup_printf ("generic_trampoline_%s", tramp_names [tramp_type]);
+}
+
+/*
+ * mono_get_rgctx_fetch_trampoline_name:
+ *
+ * Returns a pointer to malloc-ed memory.
+ */
+char*
+mono_get_rgctx_fetch_trampoline_name (int slot)
+{
+ gboolean mrgctx;
+ int index;
+
+ mrgctx = MONO_RGCTX_SLOT_IS_MRGCTX (slot);
+ index = MONO_RGCTX_SLOT_INDEX (slot);
+
+ return g_strdup_printf ("rgctx_fetch_trampoline_%s_%d", mrgctx ? "mrgctx" : "rgctx", index);
+}
+
projects / mono.git / blobdiff