2008-09-07 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / tramp-ia64.c

diff --git a/mono/mini/tramp-ia64.c b/mono/mini/tramp-ia64.c
index bbeb5915259f8f80cf3342f34963d6afd5dc0bec..cb962da6251a1190457437f7b6d15d5dd0824ff3 100644 (file)
--- a/mono/mini/tramp-ia64.c
+++ b/mono/mini/tramp-ia64.c
@@ -19,13 +19,12 @@
 #include "mini.h"
 #include "mini-ia64.h"
 
-#define NOT_IMPLEMENTED g_assert_not_reached ()
-
 #define GP_SCRATCH_REG 31
 #define GP_SCRATCH_REG2 30
 
 /*
  * mono_arch_get_unbox_trampoline:
+ * @gsctx: the generic sharing context
  * @m: method pointer
  * @addr: pointer to native code for @m
  *
@@ -34,7 +33,7 @@
  * unboxing before calling the method
  */
 gpointer
-mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
+mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *m, gpointer addr)
 {
        guint8 *buf;
        gpointer func_addr, func_gp;
@@ -45,7 +44,7 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 
        /* FIXME: Optimize this */
 
-       if (!mono_method_signature (m)->ret->byref && MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
+       if (MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
                this_reg = 1;
 
        func_addr = ((gpointer*)addr) [0];
@@ -78,7 +77,7 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 }
 
 void
-mono_arch_patch_callsite (guint8 *code, guint8 *addr)
+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
 {
        guint8 *callsite_begin;
        guint64 *callsite = (guint64*)(gpointer)(code - 16);
@@ -182,24 +181,6 @@ mono_arch_nullify_plt_entry (guint8 *code)
        g_assert_not_reached ();
 }
 
-void
-mono_arch_patch_delegate_trampoline (guint8 *code, guint8 *tramp, gssize *regs, guint8 *addr)
-{
-       /* 
-        * This is called by the code generated by OP_CALL_REG:
-        * ld8 r30=[r8],8
-        * nop.i 0x0;;
-        * mov.sptk b6=r30
-        * ld8 r1=[r8]
-        * br.call.sptk.few b0=b6
-        */
-
-       /* We patch the function descriptor instead of delegate->method_ptr */
-       //g_assert (((gpointer*)(regs [8] - 8))[0] == tramp);
-       ((gpointer*)(regs [8] - 8))[0] = mono_get_addr_from_ftnptr (addr);
-       ((gpointer*)(regs [8] - 8))[1] = NULL;
-}
-
 guchar*
 mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
 {
@@ -225,8 +206,6 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
 
        ia64_codegen_init (code, buf);
 
-       /* FIXME: Save/restore lmf */
-
        /* Stacked Registers */
        in0 = 32;
        local0 = in0 + 8;
@@ -317,14 +296,7 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
        /* FIXME: */
        ia64_mov (code, o3, 0);
 
-       if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT)
-               tramp = (guint8*)mono_class_init_trampoline;
-       else if (tramp_type == MONO_TRAMPOLINE_AOT)
-               tramp = (guint8*)mono_aot_trampoline;
-       else if (tramp_type == MONO_TRAMPOLINE_DELEGATE)
-               tramp = (guint8*)mono_delegate_trampoline;
-       else
-               tramp = (guint8*)mono_magic_trampoline;
+       tramp = (guint8*)mono_get_trampoline_func (tramp_type);
 
        /* Call the trampoline using an indirect call */
        ia64_movl (code, l0, tramp);
@@ -333,6 +305,19 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
        ia64_ld8 (code, IA64_GP, l0);
        ia64_br_call_reg (code, 0, IA64_B6);
 
+       /* Check for thread interruption */
+       /* This is not perf critical code so no need to check the interrupt flag */
+       ia64_mov (code, l2, IA64_R8);
+
+       tramp = (guint8*)mono_thread_force_interruption_checkpoint;
+       ia64_movl (code, l0, tramp);
+       ia64_ld8_inc_imm (code, l1, l0, 8);
+       ia64_mov_to_br (code, IA64_B6, l1);
+       ia64_ld8 (code, IA64_GP, l0);
+       ia64_br_call_reg (code, 0, IA64_B6);
+
+       ia64_mov (code, IA64_R8, l2);
+
        /* Restore fp regs */
        ia64_adds_imm (code, l1, saved_fpregs_offset, IA64_SP);
        for (i = 0; i < 8; ++i)
@@ -430,10 +415,10 @@ mono_arch_invalidate_method (MonoJitInfo *ji, void *func, gpointer func_arg)
        NOT_IMPLEMENTED;
 }
 
-guint8*
-mono_debugger_create_notification_function (void)
+gpointer
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
 {
-       NOT_IMPLEMENTED;
-
+       /* FIXME: implement! */
+       g_assert_not_reached ();
        return NULL;
 }