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

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

diff --git a/mono/mini/tramp-hppa.c b/mono/mini/tramp-hppa.c
index 085f4916eb61cac34944a1927c0f480870985d16..6fe57d9eb246a3929fe545f739825da3c175618e 100644 (file)
--- a/mono/mini/tramp-hppa.c
+++ b/mono/mini/tramp-hppa.c
@@ -45,6 +45,7 @@
 
 /*
  * mono_arch_get_unbox_trampoline:
+ * @gsctx: the generic sharing context
  * @m: method pointer
  * @addr: pointer to native code for @m
  *
@@ -53,13 +54,13 @@
  * 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 *code, *start;
        int this_pos = hppa_r26;
        MonoDomain *domain = mono_domain_get ();
 
-       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_pos = hppa_r25;
            
        mono_domain_lock (domain);
@@ -302,21 +303,6 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
        return code;
 }
 
-/*
- * This method is only called when running in the Mono Debugger.
- */
-gpointer
-mono_debugger_create_notification_function (void)
-{
-       guint8 *ptr, *buf;
-
-       ptr = buf = mono_global_codeman_reserve (16);
-
-       g_assert_not_reached ();
-
-       return ptr;
-}
-
 /**
  * mono_arch_create_class_init_trampoline:
  *  @vtable: the type to initialize
@@ -441,7 +427,7 @@ mono_arch_create_jit_trampoline (MonoMethod *method)
        MonoDomain* domain = mono_domain_get ();
        gpointer code_start;
 
-       tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_GENERIC);
+       tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_JIT);
        ji = create_specific_tramp (method, tramp, domain);
        code_start = ji->code_start;
        g_free (ji);
@@ -456,11 +442,3 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
        g_assert_not_reached ();
        return NULL;
 }
-
-guint32
-mono_arch_get_rgctx_lazy_fetch_offset (gpointer *regs)
-{
-       /* FIXME: implement! */
-       g_assert_not_reached ();
-       return 0;
-}