X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-trampolines.c;h=a11911e5c47985a582e0fe4eee35ec362d44fe04;hb=2709ca7625d75e5b3cf8eac8a34b95395bd15c46;hp=92abc196e803e233adfa61969d631d8952492a9e;hpb=159153b539e48a26fc8409149bfde5375dcccc5f;p=mono.git diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c index 92abc196e80..a11911e5c47 100644 --- a/mono/mini/mini-trampolines.c +++ b/mono/mini/mini-trampolines.c @@ -1,4 +1,5 @@ -/* +/** + * \file * (C) 2003 Ximian, Inc. * (C) 2003-2011 Novell, Inc. * Copyright 2011 Xamarin, Inc (http://www.xamarin.com) @@ -20,6 +21,10 @@ #include "mini.h" #include "lldb.h" +#ifdef ENABLE_INTERPRETER +#include "interp/interp.h" +#endif + /* * Address of the trampoline code. This is used by the debugger to check * whether a method is a trampoline. @@ -63,8 +68,8 @@ rgctx_tramp_info_hash (gconstpointer data) /** * mono_create_static_rgctx_trampoline: - * @m: the mono method to create a trampoline for - * @addr: the address to jump to (where the compiled code for M lives) + * \param m the mono method to create a trampoline for + * \param addr the address to jump to (where the compiled code for M lives) * * Creates a static rgctx trampoline for M which branches to ADDR which should * point to the compiled code of M. @@ -78,7 +83,7 @@ rgctx_tramp_info_hash (gconstpointer data) * * On PPC addr should be an ftnptr and the return value is an ftnptr too. * - * Returns the generated static rgctx trampoline. + * \returns the generated static rgctx trampoline. */ gpointer mono_create_static_rgctx_trampoline (MonoMethod *m, gpointer addr) @@ -115,7 +120,7 @@ mono_create_static_rgctx_trampoline (MonoMethod *m, gpointer addr) if (mono_aot_only) res = mono_aot_get_static_rgctx_trampoline (ctx, addr); else - res = mono_arch_get_static_rgctx_trampoline (m, (MonoMethodRuntimeGenericContext *)ctx, addr); + res = mono_arch_get_static_rgctx_trampoline (ctx, addr); mono_domain_lock (domain); /* Duplicates inserted while we didn't hold the lock are OK */ @@ -562,6 +567,10 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTable * vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error); return_val_if_nok (error, NULL); + /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */ + if (!variant_iface && vt->klass->rank == 1 && !vt->klass->element_class->valuetype && imt_method->klass->is_array_special_interface) + variant_iface = imt_method; + /* This is the vcall slot which gets called through the IMT trampoline */ vtable_slot_to_patch = vtable_slot; @@ -819,19 +828,19 @@ gpointer mono_magic_trampoline (mgreg_t *regs, guint8 *code, gpointer arg, guint8* tramp) { gpointer res; + MonoError error; - MONO_ENTER_GC_UNSAFE_UNBALANCED; + MONO_REQ_GC_UNSAFE_MODE; - MonoError error; + g_assert (mono_thread_is_gc_unsafe_mode ()); trampoline_calls ++; res = common_call_trampoline (regs, code, (MonoMethod *)arg, NULL, NULL, &error); - mono_error_set_pending_exception (&error); - - mono_interruption_checkpoint_from_trampoline (); - - MONO_EXIT_GC_UNSAFE_UNBALANCED; + if (!is_ok (&error)) { + mono_error_set_pending_exception (&error); + return NULL; + } return res; } @@ -1268,68 +1277,6 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr return code; } -#ifdef MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD -static gpointer -mono_handler_block_guard_trampoline (mgreg_t *regs, guint8 *code, gpointer *tramp_info, guint8* tramp) -{ - MONO_REQ_GC_UNSAFE_MODE; - - MonoContext ctx; - MonoException *exc; - MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_tls_get_jit_tls (); - gpointer resume_ip = jit_tls->handler_block_return_address; - - 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; - jit_tls->handler_block = NULL; - - if (!resume_ip) /*this should not happen, but we should avoid crashing */ - exc = mono_get_exception_execution_engine ("Invalid internal state, resuming abort after handler block but no resume ip found"); - else - exc = mono_thread_resume_interruption (); - - if (exc) { - mono_handle_exception (&ctx, (MonoObject *)exc); - mono_restore_context (&ctx); - } - - return resume_ip; -} - -gpointer -mono_create_handler_block_trampoline (void) -{ - static gpointer code; - - if (code) - return code; - - if (mono_aot_only) { - gpointer tmp = mono_aot_get_trampoline ("handler_block_trampoline"); - g_assert (tmp); - mono_memory_barrier (); - code = tmp; - return code; - } - - mono_trampolines_lock (); - if (!code) { - MonoTrampInfo *info; - gpointer tmp; - - tmp = mono_arch_create_handler_block_trampoline (&info, FALSE); - mono_tramp_info_register (info, NULL); - mono_memory_barrier (); - code = tmp; - } - mono_trampolines_unlock (); - - return code; -} -#endif - /* * mono_get_trampoline_func: * @@ -1361,10 +1308,6 @@ mono_get_trampoline_func (MonoTrampolineType tramp_type) #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; -#endif default: g_assert_not_reached (); return NULL; @@ -1404,10 +1347,6 @@ mono_trampolines_init (void) mono_trampoline_code [MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING] = create_trampoline_code (MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING); #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); @@ -1459,6 +1398,15 @@ mono_create_jump_trampoline (MonoDomain *domain, MonoMethod *method, gboolean ad error_init (error); +#ifdef ENABLE_INTERPRETER + if (mono_use_interpreter) { + gpointer ret = mono_interp_create_trampoline (domain, method, error); + if (!mono_error_ok (error)) + return NULL; + return ret; + } +#endif + code = mono_jit_find_compiled_method_with_jit_info (domain, method, &ji); /* * We cannot recover the correct type of a shared generic @@ -1726,8 +1674,7 @@ static const char*tramp_names [MONO_TRAMPOLINE_NUM] = { "delegate", "restore_stack_prot", "generic_virtual_remoting", - "vcall", - "handler_block_guard" + "vcall" }; /*