X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-trampolines.c;h=4434564ee791c374fbce341e328e96b9e66842c3;hb=2d52cec1ce23c71b2729b4a4e20e5b40e8c54ae3;hp=2f7046b1caeb07c7216fd3eeb44b9ea7081c9116;hpb=683527c69465843d05709782a2b0bacbb8da05ba;p=mono.git diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c index 2f7046b1cae..4434564ee79 100644 --- a/mono/mini/mini-trampolines.c +++ b/mono/mini/mini-trampolines.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "mini.h" @@ -22,14 +23,14 @@ */ guint8* mono_trampoline_code [MONO_TRAMPOLINE_NUM]; -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 GHashTable *class_init_hash_addr; +static GHashTable *rgctx_lazy_fetch_trampoline_hash; +static GHashTable *rgctx_lazy_fetch_trampoline_hash_addr; 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; +#define mono_trampolines_lock() mono_mutex_lock (&trampolines_mutex) +#define mono_trampolines_unlock() mono_mutex_unlock (&trampolines_mutex) +static mono_mutex_t trampolines_mutex; #ifdef MONO_ARCH_GSHARED_SUPPORTED @@ -138,22 +139,17 @@ mono_create_static_rgctx_trampoline (MonoMethod *m, gpointer addr) } #endif -#ifdef MONO_ARCH_HAVE_IMT - /* * Either IMPL_METHOD or AOT_ADDR will be set on return. - */ -static gpointer* -#ifdef __GNUC__ -/* + * + * MONO_NEVER_INLINE : * This works against problems when compiling with gcc 4.6 on arm. The 'then' part of * this line gets executed, even when the condition is false: * if (impl && mono_method_needs_static_rgctx_invoke (impl, FALSE)) * *need_rgctx_tramp = TRUE; */ -__attribute__ ((noinline)) -#endif - mono_convert_imt_slot_to_vtable_slot (gpointer* slot, mgreg_t *regs, guint8 *code, MonoMethod *method, gboolean lookup_aot, MonoMethod **impl_method, gboolean *need_rgctx_tramp, gboolean *variance_used, gpointer *aot_addr) +static MONO_NEVER_INLINE gpointer* +mono_convert_imt_slot_to_vtable_slot (gpointer* slot, mgreg_t *regs, guint8 *code, MonoMethod *method, gboolean lookup_aot, MonoMethod **impl_method, gboolean *need_rgctx_tramp, gboolean *variance_used, gpointer *aot_addr) { MonoObject *this_argument = mono_arch_get_this_arg_from_call (regs, code); MonoVTable *vt = this_argument->vtable; @@ -243,7 +239,6 @@ __attribute__ ((noinline)) } } } -#endif /* * This is a super-ugly hack to fix bug #616463. @@ -406,7 +401,6 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram orig_vtable_slot = vtable_slot; vtable_slot_to_patch = vtable_slot; -#ifdef MONO_ARCH_HAVE_IMT /* IMT call */ if (vt && (gpointer)vtable_slot < (gpointer)vt) { MonoMethod *impl_method = NULL; @@ -464,7 +458,6 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram m = impl_method; } } -#endif /* * The virtual check is needed because is_generic_method_definition (m) could @@ -484,9 +477,7 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram else g_assert (!m->klass->generic_container); -#ifdef MONO_ARCH_HAVE_IMT generic_virtual = mono_arch_find_imt_method (regs, code); -#endif if (generic_virtual) { g_assert (generic_virtual->is_inflated); context.method_inst = ((MonoMethodInflated*)generic_virtual)->context.method_inst; @@ -524,7 +515,6 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram g_assert_not_reached (); #endif } else { -#ifdef MONO_ARCH_HAVE_IMT MonoObject *this_argument = mono_arch_get_this_arg_from_call (regs, code); vt = this_argument->vtable; @@ -537,9 +527,6 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram mono_class_setup_supertypes (this_argument->vtable->klass); klass = this_argument->vtable->klass->supertypes [m->klass->idepth - 1]; } -#else - NOT_IMPLEMENTED; -#endif } g_assert (vtable_slot || klass); @@ -673,7 +660,7 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram } } if (!no_patch) - mono_aot_patch_plt_entry (plt_entry, NULL, regs, addr); + mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, addr); } else { if (generic_shared) { if (m->wrapper_type != MONO_WRAPPER_NONE) @@ -816,11 +803,9 @@ mono_generic_virtual_remoting_trampoline (mgreg_t *regs, guint8 *code, MonoMetho else g_assert (!m->klass->generic_container); -#ifdef MONO_ARCH_HAVE_IMT imt_method = mono_arch_find_imt_method (regs, code); if (imt_method->is_inflated) context.method_inst = ((MonoMethodInflated*)imt_method)->context.method_inst; -#endif m = mono_class_inflate_generic_method (declaring, &context); m = mono_marshal_get_remoting_invoke_with_check (m); @@ -869,7 +854,7 @@ mono_aot_trampoline (mgreg_t *regs, guint8 *code, guint8 *token_info, plt_entry = mono_aot_get_plt_entry (code); g_assert (plt_entry); - mono_aot_patch_plt_entry (plt_entry, NULL, regs, addr); + mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, addr); return addr; } @@ -917,7 +902,7 @@ mono_class_init_trampoline (mgreg_t *regs, guint8 *code, MonoVTable *vtable, gui if (vtable->initialized) { if (plt_entry) - mono_arch_patch_plt_entry (code, NULL, regs, mini_get_nullified_class_init_trampoline ()); + mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, mini_get_nullified_class_init_trampoline ()); else mono_arch_nullify_class_init_trampoline (code, regs); } @@ -981,24 +966,14 @@ mono_monitor_exit_trampoline (mgreg_t *regs, guint8 *code, MonoObject *obj, guin #ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE -typedef struct { - MonoMethod *invoke; - gpointer impl_this; - gpointer impl_nothis; - MonoMethod *method; - MonoMethodSignature *invoke_sig; - MonoMethodSignature *sig; - gboolean need_rgctx_tramp; -} DelegateTrampInfo; - /* * Precompute data to speed up mono_delegate_trampoline (). * METHOD might be NULL. */ -static gpointer +static MonoDelegateTrampInfo* create_delegate_trampoline_data (MonoDomain *domain, MonoClass *klass, MonoMethod *method) { - DelegateTrampInfo *tramp_data; + MonoDelegateTrampInfo *tramp_data; MonoMethod *invoke; MonoError err; @@ -1006,7 +981,7 @@ create_delegate_trampoline_data (MonoDomain *domain, MonoClass *klass, MonoMetho invoke = mono_get_delegate_invoke (klass); g_assert (invoke); - tramp_data = mono_domain_alloc (domain, sizeof (DelegateTrampInfo)); + tramp_data = mono_domain_alloc0 (domain, sizeof (MonoDelegateTrampInfo)); tramp_data->invoke = invoke; tramp_data->invoke_sig = mono_method_signature (invoke); tramp_data->impl_this = mono_arch_get_delegate_invoke_impl (mono_method_signature (invoke), TRUE); @@ -1039,13 +1014,14 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr gboolean need_rgctx_tramp = FALSE; gboolean need_unbox_tramp = FALSE; gboolean enable_caching = TRUE; - DelegateTrampInfo *tramp_info = (DelegateTrampInfo*)arg; + MonoDelegateTrampInfo *tramp_info = (MonoDelegateTrampInfo*)arg; MonoMethod *invoke = tramp_info->invoke; guint8 *impl_this = tramp_info->impl_this; guint8 *impl_nothis = tramp_info->impl_nothis; MonoError err; MonoMethodSignature *sig; gpointer addr, compiled_method; + gboolean is_remote = FALSE; trampoline_calls ++; @@ -1064,14 +1040,15 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr */ #ifndef DISABLE_REMOTING if (delegate->target && delegate->target->vtable->klass == mono_defaults.transparent_proxy_class) { + is_remote = TRUE; #ifndef DISABLE_COM if (((MonoTransparentProxy *)delegate->target)->remote_class->proxy_class != mono_class_get_com_object_class () && !mono_class_is_com_object (((MonoTransparentProxy *)delegate->target)->remote_class->proxy_class)) #endif method = mono_marshal_get_remoting_invoke (method); - } else + } #endif - { + if (!is_remote) { sig = tramp_info->sig; if (!(sig && method == tramp_info->method)) { mono_error_init (&err); @@ -1159,6 +1136,9 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr delegate->method_ptr = mono_create_static_rgctx_trampoline (method, delegate->method_ptr); } + /* Necessary for !code condition to fallback to slow path */ + code = NULL; + multicast = ((MonoMulticastDelegate*)delegate)->prev != NULL; if (!multicast && !callvirt) { if (method && (method->flags & METHOD_ATTRIBUTE_STATIC) && mono_method_signature (method)->param_count == mono_method_signature (invoke)->param_count + 1) @@ -1166,18 +1146,20 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr code = impl_this; else code = delegate->target ? impl_this : impl_nothis; + } - if (code) { - delegate->invoke_impl = mono_get_addr_from_ftnptr (code); - return code; - } + if (!code) { + /* The general, unoptimized case */ + m = mono_marshal_get_delegate_invoke (invoke, delegate); + code = mono_compile_method (m); + code = mini_add_method_trampoline (NULL, m, code, mono_method_needs_static_rgctx_invoke (m, FALSE), FALSE); } - /* The general, unoptimized case */ - m = mono_marshal_get_delegate_invoke (invoke, delegate); - code = mono_compile_method (m); - code = mini_add_method_trampoline (NULL, m, code, mono_method_needs_static_rgctx_invoke (m, FALSE), FALSE); delegate->invoke_impl = mono_get_addr_from_ftnptr (code); + if (enable_caching && !callvirt && tramp_info->method) { + tramp_info->method_ptr = delegate->method_ptr; + tramp_info->invoke_impl = delegate->invoke_impl; + } return code; } @@ -1306,7 +1288,7 @@ create_trampoline_code (MonoTrampolineType tramp_type) void mono_trampolines_init (void) { - InitializeCriticalSection (&trampolines_mutex); + mono_mutex_init_recursive (&trampolines_mutex); if (mono_aot_only) return; @@ -1351,7 +1333,7 @@ mono_trampolines_cleanup (void) if (rgctx_lazy_fetch_trampoline_hash_addr) g_hash_table_destroy (rgctx_lazy_fetch_trampoline_hash_addr); - DeleteCriticalSection (&trampolines_mutex); + mono_mutex_destroy (&trampolines_mutex); } guint8 * @@ -1538,30 +1520,29 @@ mono_create_jit_trampoline_from_token (MonoImage *image, guint32 token) /* - * mono_create_delegate_trampoline_with_method: + * mono_create_delegate_trampoline_info: * * Create a delegate trampoline for the KLASS+METHOD pair. */ -gpointer -mono_create_delegate_trampoline_with_method (MonoDomain *domain, MonoClass *klass, MonoMethod *method) +MonoDelegateTrampInfo* +mono_create_delegate_trampoline_info (MonoDomain *domain, MonoClass *klass, MonoMethod *method) { #ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE - gpointer ptr; - guint32 code_size = 0; - gpointer tramp_info; + MonoDelegateTrampInfo *tramp_info; MonoClassMethodPair pair, *dpair; + guint32 code_size = 0; pair.klass = klass; pair.method = method; mono_domain_lock (domain); - ptr = g_hash_table_lookup (domain_jit_info (domain)->delegate_trampoline_hash, &pair); + tramp_info = g_hash_table_lookup (domain_jit_info (domain)->delegate_trampoline_hash, &pair); mono_domain_unlock (domain); - if (ptr) - return ptr; + if (tramp_info) + return tramp_info; tramp_info = create_delegate_trampoline_data (domain, klass, method); - ptr = mono_create_specific_trampoline (tramp_info, MONO_TRAMPOLINE_DELEGATE, domain, &code_size); + tramp_info->invoke_impl = mono_create_specific_trampoline (tramp_info, MONO_TRAMPOLINE_DELEGATE, domain, &code_size); g_assert (code_size); dpair = mono_domain_alloc0 (domain, sizeof (MonoClassMethodPair)); @@ -1569,10 +1550,10 @@ mono_create_delegate_trampoline_with_method (MonoDomain *domain, MonoClass *klas /* store trampoline address */ mono_domain_lock (domain); - g_hash_table_insert (domain_jit_info (domain)->delegate_trampoline_hash, dpair, ptr); + g_hash_table_insert (domain_jit_info (domain)->delegate_trampoline_hash, dpair, tramp_info); mono_domain_unlock (domain); - return ptr; + return tramp_info; #else return NULL; #endif @@ -1581,7 +1562,24 @@ mono_create_delegate_trampoline_with_method (MonoDomain *domain, MonoClass *klas gpointer mono_create_delegate_trampoline (MonoDomain *domain, MonoClass *klass) { - return mono_create_delegate_trampoline_with_method (domain, klass, NULL); +#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE + return mono_create_delegate_trampoline_info (domain, klass, NULL)->invoke_impl; +#else + return NULL; +#endif +} + +gpointer +mono_create_delegate_virtual_trampoline (MonoDomain *domain, MonoClass *klass, MonoMethod *method) +{ +#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE + MonoMethod *invoke = mono_get_delegate_invoke (klass); + g_assert (invoke); + + return mono_get_delegate_virtual_invoke_impl (mono_method_signature (invoke), method); +#else + return NULL; +#endif } gpointer