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 e255a83e1da808cc572f86c03ca61a321b96caad..cb962da6251a1190457437f7b6d15d5dd0824ff3 100644 (file)
--- a/mono/mini/tramp-ia64.c
+++ b/mono/mini/tramp-ia64.c
@@ -24,6 +24,7 @@
 
 /*
  * mono_arch_get_unbox_trampoline:
+ * @gsctx: the generic sharing context
  * @m: method pointer
  * @addr: pointer to native code for @m
  *
@@ -32,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;
@@ -43,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];
@@ -76,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);
@@ -308,7 +309,7 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
        /* This is not perf critical code so no need to check the interrupt flag */
        ia64_mov (code, l2, IA64_R8);
 
-       tramp = (guint8*)mono_thread_interruption_checkpoint;
+       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);
@@ -415,9 +416,9 @@ mono_arch_invalidate_method (MonoJitInfo *ji, void *func, gpointer func_arg)
 }
 
 gpointer
-mono_debugger_create_notification_function (void)
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
 {
-       NOT_IMPLEMENTED;
-
+       /* FIXME: implement! */
+       g_assert_not_reached ();
        return NULL;
 }