2009-02-09 Zoltan Varga <vargaz@gmail.com>
[mono.git] / mono / mini / mini-trampolines.c
index f011ea6b787d0d7586a77a1c2533209df37778b5..24f1e8fe949c1123e985dec8313c8473502a9d82 100644 (file)
@@ -6,6 +6,7 @@
 #include <mono/metadata/metadata-internals.h>
 #include <mono/metadata/marshal.h>
 #include <mono/metadata/tabledefs.h>
+#include <mono/utils/mono-counters.h>
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
 #include "mini.h"
 #include "debug-mini.h"
 
+/*
+ * Address of the trampoline code.  This is used by the debugger to check
+ * whether a method is a trampoline.
+ */
+guint8* mono_trampoline_code [MONO_TRAMPOLINE_NUM];
+
+static GHashTable *class_init_hash_addr = NULL;
+static GHashTable *delegate_trampoline_hash_addr = NULL;
+static GHashTable *rgctx_lazy_fetch_trampoline_hash = NULL;
+static GHashTable *rgctx_lazy_fetch_trampoline_hash_addr = NULL;
+
+#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)
+{
+       if (mono_aot_only)
+               return mono_aot_get_unbox_trampoline (m);
+       else
+               return mono_arch_get_unbox_trampoline (gsctx, m, addr);
+}
+
 #ifdef MONO_ARCH_HAVE_IMT
 
 static gpointer*
 mono_convert_imt_slot_to_vtable_slot (gpointer* slot, gpointer *regs, guint8 *code, MonoMethod *method, MonoMethod **impl_method)
 {
-       MonoObject *this_argument = mono_arch_find_this_argument (regs, method);
+       MonoGenericSharingContext *gsctx = mono_get_generic_context_from_code (code);
+       MonoObject *this_argument = mono_arch_find_this_argument (regs, method, gsctx);
        MonoVTable *vt = this_argument->vtable;
        int displacement = slot - ((gpointer*)vt);
-       
+
        if (displacement > 0) {
                /* slot is in the vtable, not in the IMT */
 #if DEBUG_IMT
@@ -34,7 +60,6 @@ mono_convert_imt_slot_to_vtable_slot (gpointer* slot, gpointer *regs, guint8 *co
                int interface_offset;
                int imt_slot = MONO_IMT_SIZE + displacement;
 
-               mono_class_setup_vtable (vt->klass);
                interface_offset = mono_class_interface_offset (vt->klass, imt_method->klass);
 
                if (interface_offset < 0) {
@@ -44,7 +69,7 @@ mono_convert_imt_slot_to_vtable_slot (gpointer* slot, gpointer *regs, guint8 *co
                mono_vtable_build_imt_slot (vt, mono_method_get_imt_slot (imt_method));
 
                if (impl_method)
-                       *impl_method = vt->klass->vtable [interface_offset + imt_method->slot];
+                       *impl_method = mono_class_get_vtable_entry (vt->klass, interface_offset + imt_method->slot);
 #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, 
@@ -52,7 +77,7 @@ mono_convert_imt_slot_to_vtable_slot (gpointer* slot, gpointer *regs, guint8 *co
 #endif
                g_assert (imt_slot < MONO_IMT_SIZE);
                if (vt->imt_collisions_bitmap & (1 << imt_slot)) {
-                       int vtable_offset = interface_offset + imt_method->slot;
+                       int vtable_offset = interface_offset + mono_method_get_vtable_index (imt_method);
                        gpointer *vtable_slot = & (vt->vtable [vtable_offset]);
 #if DEBUG_IMT
                        printf ("mono_convert_imt_slot_to_vtable_slot: slot %p[%d] is in the IMT, and colliding becomes %p[%d] (interface_offset = %d, method->slot = %d)\n", slot, imt_slot, vtable_slot, vtable_offset, interface_offset, imt_method->slot);
@@ -78,12 +103,28 @@ mono_magic_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp)
 {
        gpointer addr;
        gpointer *vtable_slot;
+       gboolean generic_shared = FALSE;
+       MonoMethod *declaring = NULL;
+       MonoGenericInst *generic_virtual_method_inst = NULL;
+       int context_used;
 
 #if MONO_ARCH_COMMON_VTABLE_TRAMPOLINE
        if (m == MONO_FAKE_VTABLE_METHOD) {
                int displacement;
                MonoVTable *vt = mono_arch_get_vcall_slot (code, (gpointer*)regs, &displacement);
-               g_assert (vt);
+               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);
+               }
                if (displacement > 0) {
                        displacement -= G_STRUCT_OFFSET (MonoVTable, vtable);
                        g_assert (displacement >= 0);
@@ -100,10 +141,7 @@ mono_magic_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp)
                                return addr;
                        }
 
-                       mono_class_setup_vtable (vt->klass);
-                       m = vt->klass->vtable [displacement];
-                       if (m->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
-                               m = mono_marshal_get_synchronized_wrapper (m);
+                       m = mono_class_get_vtable_entry (vt->klass, displacement);
                        /*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 */
@@ -131,20 +169,177 @@ mono_magic_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp)
        }
 #endif
 
+       if (m->is_generic) {
+               MonoGenericContext context = { NULL, NULL };
+               MonoMethod *declaring;
+
+               if (m->is_inflated)
+                       declaring = mono_method_get_declaring_generic_method (m);
+               else
+                       declaring = m;
+
+               if (m->klass->generic_class)
+                       context.class_inst = m->klass->generic_class->context.class_inst;
+               else
+                       g_assert (!m->klass->generic_container);
+
+#ifdef MONO_ARCH_HAVE_IMT
+               generic_virtual_method_inst = (MonoGenericInst*)mono_arch_find_imt_method ((gpointer*)regs, code);
+#endif
+               context.method_inst = generic_virtual_method_inst;
+
+               m = mono_class_inflate_generic_method (declaring, &context);
+               /* FIXME: only do this if the method is sharable */
+               m = mono_marshal_get_static_rgctx_invoke (m);
+       } else if ((context_used = mono_method_check_context_used (m))) {
+               MonoClass *klass = NULL;
+               MonoMethod *actual_method = NULL;
+               MonoVTable *vt = NULL;
+               MonoGenericInst *method_inst = NULL;
+
+               vtable_slot = NULL;
+               generic_shared = TRUE;
+
+               g_assert (code);
+
+               if (m->is_inflated && mono_method_get_context (m)->method_inst) {
+#ifdef MONO_ARCH_RGCTX_REG
+                       MonoMethodRuntimeGenericContext *mrgctx = (MonoMethodRuntimeGenericContext*)mono_arch_find_static_call_vtable ((gpointer*)regs, code);
+
+                       klass = mrgctx->class_vtable->klass;
+                       method_inst = mrgctx->method_inst;
+#else
+                       g_assert_not_reached ();
+#endif
+               } else if ((m->flags & METHOD_ATTRIBUTE_STATIC) || m->klass->valuetype) {
+#ifdef MONO_ARCH_RGCTX_REG
+                       MonoVTable *vtable = mono_arch_find_static_call_vtable ((gpointer*)regs, code);
+
+                       klass = vtable->klass;
+#else
+                       g_assert_not_reached ();
+#endif
+               } else {
+#ifdef MONO_ARCH_HAVE_IMT
+                       MonoObject *this_argument = mono_arch_find_this_argument ((gpointer*)regs, m,
+                               mono_get_generic_context_from_code (code));
+
+                       vt = this_argument->vtable;
+                       vtable_slot = mono_arch_get_vcall_slot_addr (code, (gpointer*)regs);
+
+                       g_assert (this_argument->vtable->klass->inited);
+                       //mono_class_init (this_argument->vtable->klass);
+
+                       if (!vtable_slot)
+                               klass = this_argument->vtable->klass->supertypes [m->klass->idepth - 1];
+#else
+                       NOT_IMPLEMENTED;
+#endif
+               }
+
+               g_assert (vtable_slot || klass);
+
+               if (vtable_slot) {
+                       int displacement = vtable_slot - ((gpointer*)vt);
+
+                       g_assert_not_reached ();
+
+                       g_assert (displacement > 0);
+
+                       actual_method = vt->klass->vtable [displacement];
+               }
+
+               if (method_inst) {
+                       MonoGenericContext context = { NULL, NULL };
+
+                       if (m->is_inflated)
+                               declaring = mono_method_get_declaring_generic_method (m);
+                       else
+                               declaring = m;
+
+                       if (klass->generic_class)
+                               context.class_inst = klass->generic_class->context.class_inst;
+                       else if (klass->generic_container)
+                               context.class_inst = klass->generic_container->context.class_inst;
+                       context.method_inst = method_inst;
+
+                       actual_method = mono_class_inflate_generic_method (declaring, &context);
+               } else {
+                       actual_method = mono_class_get_method_generic (klass, m);
+               }
+
+               g_assert (klass);
+               g_assert (actual_method->klass == klass);
+
+               if (actual_method->is_inflated)
+                       declaring = mono_method_get_declaring_generic_method (actual_method);
+               else
+                       declaring = NULL;
+
+               m = actual_method;
+       }
+
+       if (m->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED) {
+               MonoJitInfo *ji;
+
+               if (code)
+                       ji = mono_jit_info_table_find (mono_domain_get (), (char*)code);
+               else
+                       ji = NULL;
+
+               /* Avoid recursion */
+               if (!(ji && ji->method->wrapper_type == MONO_WRAPPER_SYNCHRONIZED))
+                       m = mono_marshal_get_synchronized_wrapper (m);
+       }
+
        addr = mono_compile_method (m);
        g_assert (addr);
 
        mono_debugger_trampoline_compiled (m, addr);
 
+       if (generic_virtual_method_inst) {
+               vtable_slot = mono_arch_get_vcall_slot_addr (code, (gpointer*)regs);
+               g_assert (vtable_slot);
+
+               mono_method_add_generic_virtual_invocation (mono_domain_get (), vtable_slot,
+                       generic_virtual_method_inst, addr);
+
+               return addr;
+       }
+
        /* the method was jumped to */
-       if (!code)
+       if (!code) {
+               MonoDomain *domain = mono_domain_get ();
+
+               /* Patch the got entries pointing to this method */
+               /* 
+                * We do this here instead of in mono_codegen () to cover the case when m
+                * was loaded from an aot image.
+                */
+               if (domain_jit_info (domain)->jump_target_got_slot_hash) {
+                       GSList *list, *tmp;
+
+                       mono_domain_lock (domain);
+                       list = g_hash_table_lookup (domain_jit_info (domain)->jump_target_got_slot_hash, m);
+                       if (list) {
+                               for (tmp = list; tmp; tmp = tmp->next) {
+                                       gpointer *got_slot = tmp->data;
+                                       *got_slot = addr;
+                               }
+                               g_hash_table_remove (domain_jit_info (domain)->jump_target_got_slot_hash, m);
+                               g_slist_free (list);
+                       }
+                       mono_domain_unlock (domain);
+               }
+
                return addr;
+       }
 
        vtable_slot = mono_arch_get_vcall_slot_addr (code, (gpointer*)regs);
 
        if (vtable_slot) {
                if (m->klass->valuetype)
-                       addr = mono_arch_get_unbox_trampoline (m, addr);
+                       addr = get_unbox_trampoline (mono_get_generic_context_from_code (code), m, addr);
 
                g_assert (*vtable_slot);
 
@@ -158,23 +353,67 @@ mono_magic_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp)
        else {
                guint8 *plt_entry = mono_aot_get_plt_entry (code);
 
-               /* Patch calling code */
                if (plt_entry) {
                        mono_arch_patch_plt_entry (plt_entry, addr);
-               } else {
-                       MonoJitInfo *ji = 
-                               mono_jit_info_table_find (mono_domain_get (), (char*)code);
-                       MonoJitInfo *target_ji = 
-                               mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr));
+               } else if (!generic_shared || (m->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+                       mono_domain_lookup_shared_generic (mono_domain_get (), declaring)) {
+                       if (generic_shared) {
+                               if (m->wrapper_type != MONO_WRAPPER_NONE)
+                                       m = mono_marshal_method_from_wrapper (m);
+                               g_assert (mono_method_is_generic_sharable_impl (m, FALSE));
+                       }
+
+                       /* Patch calling code */
+                       if (plt_entry) {
 
-                       if (mono_method_same_domain (ji, target_ji))
-                               mono_arch_patch_callsite (code, addr);
+                       } else {
+                               MonoJitInfo *ji = 
+                                       mono_jit_info_table_find (mono_domain_get (), (char*)code);
+                               MonoJitInfo *target_ji = 
+                                       mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr));
+
+                               if (mono_method_same_domain (ji, target_ji))
+                                       mono_arch_patch_callsite (ji->code_start, code, addr);
+                       }
                }
        }
 
        return addr;
 }
 
+gpointer
+mono_generic_virtual_remoting_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8 *tramp)
+{
+       MonoGenericContext context = { NULL, NULL };
+       MonoMethod *declaring;
+       gpointer addr;
+
+       g_assert (m->is_generic);
+
+       if (m->is_inflated)
+               declaring = mono_method_get_declaring_generic_method (m);
+       else
+               declaring = m;
+
+       if (m->klass->generic_class)
+               context.class_inst = m->klass->generic_class->context.class_inst;
+       else
+               g_assert (!m->klass->generic_container);
+
+#ifdef MONO_ARCH_HAVE_IMT
+       context.method_inst = (MonoGenericInst*)mono_arch_find_imt_method ((gpointer*)regs, code);
+#endif
+       m = mono_class_inflate_generic_method (declaring, &context);
+       m = mono_marshal_get_remoting_invoke_with_check (m);
+
+       addr = mono_compile_method (m);
+       g_assert (addr);
+
+       mono_debugger_trampoline_compiled (m, addr);
+
+       return addr;
+}
+
 /*
  * mono_aot_trampoline:
  *
@@ -192,6 +431,7 @@ mono_aot_trampoline (gssize *regs, guint8 *code, guint8 *token_info,
        gpointer addr;
        gpointer *vtable_slot;
        gboolean is_got_entry;
+       guint8 *plt_entry;
 
        image = *(gpointer*)(gpointer)token_info;
        token_info += sizeof (gpointer);
@@ -202,36 +442,20 @@ mono_aot_trampoline (gssize *regs, guint8 *code, guint8 *token_info,
                method = mono_get_method (image, token, NULL);
                g_assert (method);
 
-               //printf ("F: %s\n", mono_method_full_name (method, TRUE));
-
-               if (method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
-                       method = mono_marshal_get_synchronized_wrapper (method);
-
-               addr = mono_compile_method (method);
-               g_assert (addr);
+               /* Use the generic code */
+               return mono_magic_trampoline (regs, code, method, tramp);
        }
 
        vtable_slot = mono_arch_get_vcall_slot_addr (code, (gpointer*)regs);
+       g_assert (!vtable_slot);
 
-       if (vtable_slot) {
-               is_got_entry = mono_aot_is_got_entry (code, (guint8*)vtable_slot);
-
-               if (!is_got_entry) {
-                       if (!method)
-                               method = mono_get_method (image, token, NULL);
-                       if (method->klass->valuetype)
-                               addr = mono_arch_get_unbox_trampoline (method, addr);
-               }
-       } else {
-               /* This is a normal call through a PLT entry */
-               guint8 *plt_entry = mono_aot_get_plt_entry (code);
+       /* This is a normal call through a PLT entry */
+       plt_entry = mono_aot_get_plt_entry (code);
+       g_assert (plt_entry);
 
-               g_assert (plt_entry);
+       mono_arch_patch_plt_entry (plt_entry, addr);
 
-               mono_arch_patch_plt_entry (plt_entry, addr);
-
-               is_got_entry = FALSE;
-       }
+       is_got_entry = FALSE;
 
        /*
         * Since AOT code is only used in the root domain, 
@@ -260,11 +484,7 @@ gpointer
 mono_aot_plt_trampoline (gssize *regs, guint8 *code, guint8 *aot_module, 
                                                 guint8* tramp)
 {
-#ifdef MONO_ARCH_AOT_PLT_OFFSET_REG
-       guint32 plt_info_offset = regs [MONO_ARCH_AOT_PLT_OFFSET_REG];
-#else
-       guint32 plt_info_offset = -1;
-#endif
+       guint32 plt_info_offset = mono_aot_get_plt_info_offset (regs, code);
 
        return mono_aot_plt_resolve (aot_module, plt_info_offset, code);
 }
@@ -283,73 +503,605 @@ mono_class_init_trampoline (gssize *regs, guint8 *code, MonoVTable *vtable, guin
 
        mono_runtime_class_init (vtable);
 
-       if (!mono_running_on_valgrind ()) {
-               if (plt_entry) {
-                       mono_arch_nullify_plt_entry (plt_entry);
-               } else {
-                       mono_arch_nullify_class_init_trampoline (code, regs);
-               }
+       if (plt_entry) {
+               mono_arch_nullify_plt_entry (plt_entry);
+       } else {
+               mono_arch_nullify_class_init_trampoline (code, regs);
        }
 }
 
+/**
+ * mono_generic_class_init_trampoline:
+ *
+ * This method calls mono_runtime_class_init () to run the static constructor
+ * for the type.
+ */
+void
+mono_generic_class_init_trampoline (gssize *regs, guint8 *code, MonoVTable *vtable, guint8 *tramp)
+{
+       g_assert (!vtable->initialized);
+
+       mono_runtime_class_init (vtable);
+}
+
+static gpointer
+mono_rgctx_lazy_fetch_trampoline (gssize *regs, guint8 *code, gpointer data, guint8 *tramp)
+{
+#ifdef MONO_ARCH_VTABLE_REG
+       static gboolean inited = FALSE;
+       static int num_lookups = 0;
+       guint32 slot = GPOINTER_TO_UINT (data);
+       gpointer arg = (gpointer)(gssize)regs [MONO_ARCH_VTABLE_REG];
+       guint32 index = MONO_RGCTX_SLOT_INDEX (slot);
+       gboolean mrgctx = MONO_RGCTX_SLOT_IS_MRGCTX (slot);
+
+       if (!inited) {
+               mono_counters_register ("RGCTX unmanaged lookups", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_lookups);
+               inited = TRUE;
+       }
+
+       num_lookups++;
+
+       if (mrgctx)
+               return mono_method_fill_runtime_generic_context (arg, index);
+       else
+               return mono_class_fill_runtime_generic_context (arg, index);
+#else
+       g_assert_not_reached ();
+#endif
+}
+
+void
+mono_monitor_enter_trampoline (gssize *regs, guint8 *code, MonoObject *obj, guint8 *tramp)
+{
+       mono_monitor_enter (obj);
+}
+
+void
+mono_monitor_exit_trampoline (gssize *regs, guint8 *code, MonoObject *obj, guint8 *tramp)
+{
+       mono_monitor_exit (obj);
+}
+
 #ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
 
 /**
  * mono_delegate_trampoline:
  *
  *   This trampoline handles calls made to Delegate:Invoke ().
+ * This is called once the first time a delegate is invoked, so it must be fast.
  */
 gpointer
-mono_delegate_trampoline (gssize *regs, guint8 *code, MonoClass *klass, guint8* tramp)
+mono_delegate_trampoline (gssize *regs, guint8 *code, gpointer *tramp_data, guint8* tramp)
 {
        MonoDomain *domain = mono_domain_get ();
        MonoDelegate *delegate;
        MonoJitInfo *ji;
-       gpointer iter;
-       MonoMethod *invoke, *m;
+       MonoMethod *m;
+       MonoMethod *method = NULL;
        gboolean multicast, callvirt;
-
-       /* Find the Invoke method */
-       iter = NULL;
-       while ((invoke = mono_class_get_methods (klass, &iter))) {
-               if (!strcmp (invoke->name, "Invoke"))
-                       break;
-       }
-       g_assert (invoke);
+       MonoMethod *invoke = tramp_data [0];
+       guint8 *impl_this = tramp_data [1];
+       guint8 *impl_nothis = tramp_data [2];
 
        /* Obtain the delegate object according to the calling convention */
 
-       delegate = mono_arch_get_this_arg_from_call (mono_method_signature (invoke), regs, code);
+       /* 
+        * 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);
+
+       if (delegate->method) {
+               method = delegate->method;
+
+               /*
+                * delegate->method_ptr == NULL means the delegate was initialized by 
+                * mini_delegate_ctor, while != NULL means it is initialized by 
+                * mono_delegate_ctor_with_method (). In both cases, we need to add wrappers
+                * (ctor_with_method () does this, but it doesn't store the wrapper back into
+                * delegate->method).
+                */
+               if (delegate->target && delegate->target->vtable->klass == mono_defaults.transparent_proxy_class)
+                       method = mono_marshal_get_remoting_invoke (method);
+               else if (mono_method_signature (method)->hasthis && method->klass->valuetype)
+                       method = mono_marshal_get_unbox_wrapper (method);
+       } else {
+               ji = mono_jit_info_table_find (domain, mono_get_addr_from_ftnptr (delegate->method_ptr));
+               if (ji)
+                       method = ji->method;
+       }
+       callvirt = !delegate->target && method && mono_method_signature (method)->hasthis;
+
+       if (method && method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
+               method = mono_marshal_get_synchronized_wrapper (method);
 
        /* 
         * If the called address is a trampoline, replace it with the compiled method so
         * further calls don't have to go through the trampoline.
         */
-       ji = mono_jit_info_table_find (domain, mono_get_addr_from_ftnptr (delegate->method_ptr));
-       callvirt = !delegate->target && ji && mono_method_signature (ji->method)->hasthis;
-       if (ji && !callvirt) {
-               delegate->method_ptr = mono_compile_method (ji->method);
-               mono_debugger_trampoline_compiled (ji->method, delegate->method_ptr);
+       if (method && !callvirt) {
+               /* Avoid the overhead of looking up an already compiled method if possible */
+               if (delegate->method_code && *delegate->method_code) {
+                       delegate->method_ptr = *delegate->method_code;
+               } else {
+                       delegate->method_ptr = mono_compile_method (method);
+                       if (delegate->method_code)
+                               *delegate->method_code = delegate->method_ptr;
+                       mono_debugger_trampoline_compiled (method, delegate->method_ptr);
+               }
        }
 
        multicast = ((MonoMulticastDelegate*)delegate)->prev != NULL;
        if (!multicast && !callvirt) {
-               code = mono_arch_get_delegate_invoke_impl (mono_method_signature (invoke), delegate->target != NULL);
+               code = delegate->target ? impl_this : impl_nothis;
 
                if (code) {
-                       delegate->invoke_impl = code;
+                       delegate->invoke_impl = mono_get_addr_from_ftnptr (code);
                        return code;
                }
        }
 
        /* The general, unoptimized case */
        m = mono_marshal_get_delegate_invoke (invoke, delegate);
-       delegate->invoke_impl = mono_compile_method (m);
+       code = mono_compile_method (m);
+       delegate->invoke_impl = mono_get_addr_from_ftnptr (code);
        mono_debugger_trampoline_compiled (m, delegate->invoke_impl);
 
-       return delegate->invoke_impl;
+       return code;
+}
+
+#endif
+
+/*
+ * mono_get_trampoline_func:
+ *
+ *   Return the C function which needs to be called by the generic trampoline of type
+ * TRAMP_TYPE.
+ */
+gconstpointer
+mono_get_trampoline_func (MonoTrampolineType tramp_type)
+{
+       switch (tramp_type) {
+       case MONO_TRAMPOLINE_JIT:
+       case MONO_TRAMPOLINE_JUMP:
+               return mono_magic_trampoline;
+       case MONO_TRAMPOLINE_CLASS_INIT:
+               return mono_class_init_trampoline;
+       case MONO_TRAMPOLINE_GENERIC_CLASS_INIT:
+               return mono_generic_class_init_trampoline;
+       case MONO_TRAMPOLINE_RGCTX_LAZY_FETCH:
+               return mono_rgctx_lazy_fetch_trampoline;
+#ifdef MONO_ARCH_AOT_SUPPORTED
+       case MONO_TRAMPOLINE_AOT:
+               return mono_aot_trampoline;
+       case MONO_TRAMPOLINE_AOT_PLT:
+               return mono_aot_plt_trampoline;
+#endif
+#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
+       case MONO_TRAMPOLINE_DELEGATE:
+               return mono_delegate_trampoline;
+#endif
+       case MONO_TRAMPOLINE_RESTORE_STACK_PROT:
+               return mono_altstack_restore_prot;
+       case MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING:
+               return mono_generic_virtual_remoting_trampoline;
+       case MONO_TRAMPOLINE_MONITOR_ENTER:
+               return mono_monitor_enter_trampoline;
+       case MONO_TRAMPOLINE_MONITOR_EXIT:
+               return mono_monitor_exit_trampoline;
+       default:
+               g_assert_not_reached ();
+               return NULL;
+       }
+}
+
+void
+mono_trampolines_init (void)
+{
+       InitializeCriticalSection (&trampolines_mutex);
+
+       if (mono_aot_only)
+               return;
+
+       mono_trampoline_code [MONO_TRAMPOLINE_JIT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_JIT);
+       mono_trampoline_code [MONO_TRAMPOLINE_JUMP] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_JUMP);
+       mono_trampoline_code [MONO_TRAMPOLINE_CLASS_INIT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_CLASS_INIT);
+       mono_trampoline_code [MONO_TRAMPOLINE_GENERIC_CLASS_INIT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_GENERIC_CLASS_INIT);
+       mono_trampoline_code [MONO_TRAMPOLINE_RGCTX_LAZY_FETCH] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_RGCTX_LAZY_FETCH);
+#ifdef MONO_ARCH_AOT_SUPPORTED
+       mono_trampoline_code [MONO_TRAMPOLINE_AOT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_AOT);
+       mono_trampoline_code [MONO_TRAMPOLINE_AOT_PLT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_AOT_PLT);
+#endif
+#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
+       mono_trampoline_code [MONO_TRAMPOLINE_DELEGATE] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_DELEGATE);
+#endif
+       mono_trampoline_code [MONO_TRAMPOLINE_RESTORE_STACK_PROT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_RESTORE_STACK_PROT);
+       mono_trampoline_code [MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING);
+       mono_trampoline_code [MONO_TRAMPOLINE_MONITOR_ENTER] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_MONITOR_ENTER);
+       mono_trampoline_code [MONO_TRAMPOLINE_MONITOR_EXIT] = mono_arch_create_trampoline_code (MONO_TRAMPOLINE_MONITOR_EXIT);
+}
+
+void
+mono_trampolines_cleanup (void)
+{
+       if (class_init_hash_addr)
+               g_hash_table_destroy (class_init_hash_addr);
+       if (delegate_trampoline_hash_addr)
+               g_hash_table_destroy (delegate_trampoline_hash_addr);
+
+       DeleteCriticalSection (&trampolines_mutex);
+}
+
+guint8 *
+mono_get_trampoline_code (MonoTrampolineType tramp_type)
+{
+       g_assert (mono_trampoline_code [tramp_type]);
+
+       return mono_trampoline_code [tramp_type];
+}
+
+gpointer
+mono_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len)
+{
+       if (mono_aot_only)
+               return mono_aot_create_specific_trampoline (mono_defaults.corlib, arg1, tramp_type, domain, code_len);
+       else
+               return mono_arch_create_specific_trampoline (arg1, tramp_type, domain, code_len);
+}
+
+gpointer
+mono_create_class_init_trampoline (MonoVTable *vtable)
+{
+       gpointer code, ptr;
+       MonoDomain *domain = vtable->domain;
+
+       g_assert (!vtable->klass->generic_container);
+
+       /* previously created trampoline code */
+       mono_domain_lock (domain);
+       ptr = 
+               g_hash_table_lookup (domain_jit_info (domain)->class_init_trampoline_hash,
+                                                                 vtable);
+       mono_domain_unlock (domain);
+       if (ptr)
+               return ptr;
+
+       code = mono_create_specific_trampoline (vtable, MONO_TRAMPOLINE_CLASS_INIT, domain, NULL);
+
+       ptr = mono_create_ftnptr (domain, code);
+
+       /* store trampoline address */
+       mono_domain_lock (domain);
+       g_hash_table_insert (domain_jit_info (domain)->class_init_trampoline_hash,
+                                                         vtable, ptr);
+       mono_domain_unlock (domain);
+
+       mono_trampolines_lock ();
+       if (!class_init_hash_addr)
+               class_init_hash_addr = g_hash_table_new (NULL, NULL);
+       g_hash_table_insert (class_init_hash_addr, ptr, vtable);
+       mono_trampolines_unlock ();
+
+       return ptr;
 }
 
+gpointer
+mono_create_generic_class_init_trampoline (void)
+{
+#ifdef MONO_ARCH_VTABLE_REG
+       static gpointer code;
+
+       mono_trampolines_lock ();
+
+       if (!code) {
+               if (mono_aot_only)
+                       code = mono_aot_get_named_code ("generic_class_init_trampoline");
+               else
+                       code = mono_arch_create_generic_class_init_trampoline ();
+       }
+
+       mono_trampolines_unlock ();
+
+       return code;
+#else
+       g_assert_not_reached ();
 #endif
+}
+
+gpointer
+mono_create_jump_trampoline (MonoDomain *domain, MonoMethod *method, gboolean add_sync_wrapper)
+{
+       MonoJitInfo *ji;
+       gpointer code;
+       guint32 code_size = 0;
+
+       code = mono_jit_find_compiled_method (domain, method);
+       if (code)
+               return code;
+
+       mono_domain_lock (domain);
+       code = g_hash_table_lookup (domain_jit_info (domain)->jump_trampoline_hash, method);
+       mono_domain_unlock (domain);
+       if (code)
+               return code;
+
+       code = mono_create_specific_trampoline (method, MONO_TRAMPOLINE_JUMP, mono_domain_get (), &code_size);
+       g_assert (code_size);
+
+       mono_domain_lock (domain);
+       ji = mono_domain_alloc0 (domain, sizeof (MonoJitInfo));
+       mono_domain_unlock (domain);
+       ji->code_start = code;
+       ji->code_size = code_size;
+       ji->method = method;
+
+       /*
+        * mono_delegate_ctor needs to find the method metadata from the 
+        * trampoline address, so we save it here.
+        */
 
+       mono_jit_info_table_add (domain, ji);
 
+       mono_domain_lock (domain);
+       g_hash_table_insert (domain_jit_info (domain)->jump_trampoline_hash, method, ji->code_start);
+       mono_domain_unlock (domain);
+
+       return ji->code_start;
+}
+
+gpointer
+mono_create_jit_trampoline_in_domain (MonoDomain *domain, MonoMethod *method)
+{
+       gpointer tramp;
+
+       if (mono_aot_only) {
+               /* Avoid creating trampolines if possible */
+               gpointer code = mono_jit_find_compiled_method (domain, method);
+               
+               if (code)
+                       return code;
+       }
+
+       mono_domain_lock (domain);
+       tramp = g_hash_table_lookup (domain_jit_info (domain)->jit_trampoline_hash, method);
+       mono_domain_unlock (domain);
+       if (tramp)
+               return tramp;
+
+       tramp = mono_create_specific_trampoline (method, MONO_TRAMPOLINE_JIT, domain, NULL);
+       
+       mono_domain_lock (domain);
+       g_hash_table_insert (domain_jit_info (domain)->jit_trampoline_hash, method, tramp);
+       mono_domain_unlock (domain);
+
+       mono_jit_stats.method_trampolines++;
+
+       return tramp;
+}      
+
+gpointer
+mono_create_jit_trampoline (MonoMethod *method)
+{
+       return mono_create_jit_trampoline_in_domain (mono_domain_get (), method);
+}
+
+#ifdef MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
+gpointer
+mono_create_jit_trampoline_from_token (MonoImage *image, guint32 token)
+{
+       gpointer tramp;
+
+       MonoDomain *domain = mono_domain_get ();
+       guint8 *buf, *start;
+
+       mono_domain_lock (domain);
+       buf = start = mono_code_manager_reserve (domain->code_mp, 2 * sizeof (gpointer));
+       mono_domain_unlock (domain);
+
+       *(gpointer*)(gpointer)buf = image;
+       buf += sizeof (gpointer);
+       *(guint32*)(gpointer)buf = token;
+
+       tramp = mono_create_specific_trampoline (start, MONO_TRAMPOLINE_AOT, domain, NULL);
+
+       mono_jit_stats.method_trampolines++;
+
+       return tramp;
+}      
+#endif
+
+gpointer
+mono_create_delegate_trampoline (MonoClass *klass)
+{
+#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
+       MonoDomain *domain = mono_domain_get ();
+       gpointer ptr;
+       guint32 code_size = 0;
+       gpointer *tramp_data;
+       MonoMethod *invoke;
+
+       mono_domain_lock (domain);
+       ptr = g_hash_table_lookup (domain_jit_info (domain)->delegate_trampoline_hash, klass);
+       mono_domain_unlock (domain);
+       if (ptr)
+               return ptr;
+
+       // Precompute the delegate invoke impl and pass it to the delegate trampoline
+       invoke = mono_get_delegate_invoke (klass);
+       g_assert (invoke);
+
+       mono_domain_lock (domain );
+       tramp_data = mono_domain_alloc (domain, sizeof (gpointer) * 3);
+       mono_domain_unlock (domain);
+       tramp_data [0] = invoke;
+       if (mono_aot_only) {
+               tramp_data [1] = NULL;
+               tramp_data [2] = NULL;
+       } else {
+               tramp_data [1] = mono_arch_get_delegate_invoke_impl (mono_method_signature (invoke), TRUE);
+               tramp_data [2] = mono_arch_get_delegate_invoke_impl (mono_method_signature (invoke), FALSE);
+       }
+
+       ptr = mono_create_specific_trampoline (tramp_data, MONO_TRAMPOLINE_DELEGATE, mono_domain_get (), &code_size);
+       g_assert (code_size);
+
+       /* store trampoline address */
+       mono_domain_lock (domain);
+       g_hash_table_insert (domain_jit_info (domain)->delegate_trampoline_hash,
+                                                         klass, ptr);
+       mono_domain_unlock (domain);
+
+       mono_trampolines_lock ();
+       if (!delegate_trampoline_hash_addr)
+               delegate_trampoline_hash_addr = g_hash_table_new (NULL, NULL);
+       g_hash_table_insert (delegate_trampoline_hash_addr, ptr, klass);
+       mono_trampolines_unlock ();
+
+       return ptr;
+#else
+       return NULL;
+#endif
+}
+
+gpointer
+mono_create_rgctx_lazy_fetch_trampoline (guint32 offset)
+{
+       static gboolean inited = FALSE;
+       static int num_trampolines = 0;
+
+       gpointer tramp, ptr;
+
+       if (mono_aot_only)
+               return mono_aot_get_lazy_fetch_trampoline (offset);
+
+       mono_trampolines_lock ();
+       if (rgctx_lazy_fetch_trampoline_hash)
+               tramp = g_hash_table_lookup (rgctx_lazy_fetch_trampoline_hash, GUINT_TO_POINTER (offset));
+       else
+               tramp = NULL;
+       mono_trampolines_unlock ();
+       if (tramp)
+               return tramp;
+
+       tramp = mono_arch_create_rgctx_lazy_fetch_trampoline (offset);
+       ptr = mono_create_ftnptr (mono_get_root_domain (), tramp);
+
+       mono_trampolines_lock ();
+       if (!rgctx_lazy_fetch_trampoline_hash) {
+               rgctx_lazy_fetch_trampoline_hash = g_hash_table_new (NULL, NULL);
+               rgctx_lazy_fetch_trampoline_hash_addr = g_hash_table_new (NULL, NULL);
+       }
+       g_hash_table_insert (rgctx_lazy_fetch_trampoline_hash, GUINT_TO_POINTER (offset), ptr);
+       g_assert (offset != -1);
+       g_hash_table_insert (rgctx_lazy_fetch_trampoline_hash_addr, ptr, GUINT_TO_POINTER (offset + 1));
+       mono_trampolines_unlock ();
+
+       if (!inited) {
+               mono_counters_register ("RGCTX num lazy fetch trampolines",
+                               MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_trampolines);
+               inited = TRUE;
+       }
+       num_trampolines++;
+
+       return ptr;
+}
+
+gpointer
+mono_create_monitor_enter_trampoline (void)
+{
+       static gpointer code;
+
+       if (mono_aot_only) {
+               if (!code)
+                       code = mono_aot_get_named_code ("monitor_enter_trampoline");
+               return code;
+       }
+
+#ifdef MONO_ARCH_MONITOR_OBJECT_REG
+       mono_trampolines_lock ();
+
+       if (!code)
+               code = mono_arch_create_monitor_enter_trampoline ();
+
+       mono_trampolines_unlock ();
+#else
+       code = NULL;
+       g_assert_not_reached ();
+#endif
+
+       return code;
+}
+
+gpointer
+mono_create_monitor_exit_trampoline (void)
+{
+       static gpointer code;
+
+       if (mono_aot_only) {
+               if (!code)
+                       code = mono_aot_get_named_code ("monitor_exit_trampoline");
+               return code;
+       }
+
+#ifdef MONO_ARCH_MONITOR_OBJECT_REG
+       mono_trampolines_lock ();
+
+       if (!code)
+               code = mono_arch_create_monitor_exit_trampoline ();
+
+       mono_trampolines_unlock ();
+#else
+       code = NULL;
+       g_assert_not_reached ();
+#endif
+       return code;
+}
+
+MonoVTable*
+mono_find_class_init_trampoline_by_addr (gconstpointer addr)
+{
+       MonoVTable *res;
+
+       mono_trampolines_lock ();
+       if (class_init_hash_addr)
+               res = g_hash_table_lookup (class_init_hash_addr, addr);
+       else
+               res = NULL;
+       mono_trampolines_unlock ();
+       return res;
+}
+
+MonoClass*
+mono_find_delegate_trampoline_by_addr (gconstpointer addr)
+{
+       MonoClass *res;
+
+       mono_trampolines_lock ();
+       if (delegate_trampoline_hash_addr)
+               res = g_hash_table_lookup (delegate_trampoline_hash_addr, addr);
+       else
+               res = NULL;
+       mono_trampolines_unlock ();
+       return res;
+}
+
+guint32
+mono_find_rgctx_lazy_fetch_trampoline_by_addr (gconstpointer addr)
+{
+       int offset;
+
+       mono_trampolines_lock ();
+       if (rgctx_lazy_fetch_trampoline_hash_addr) {
+               /* We store the real offset + 1 so we can detect when the lookup fails */
+               offset = GPOINTER_TO_INT (g_hash_table_lookup (rgctx_lazy_fetch_trampoline_hash_addr, addr));
+               if (offset)
+                       offset -= 1;
+               else
+                       offset = -1;
+       } else {
+               offset = -1;
+       }
+       mono_trampolines_unlock ();
+       return offset;
+}