2008-08-22 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/tramp-s390x.c b/mono/mini/tramp-s390x.c
index ae83968e897115784fdfb46b0ae51eea87ccb21e..b382c84a8e0ca6b35b95a58927f2fe23ac5fab54 100644 (file)
--- a/mono/mini/tramp-s390x.c
+++ b/mono/mini/tramp-s390x.c
@@ -82,21 +82,21 @@
 /*                When value type methods are called through the    */
 /*               vtable we need to unbox the 'this' argument.      */
 /*                                                                 */
-/* Parameters   - method - Methd pointer                           */
+/* Parameters   - gsctx  - Generic sharing context                 */
+/*                method - Methd pointer                           */
 /*               addr   - Pointer to native code for method        */
 /*                                                                 */
 /*------------------------------------------------------------------*/
 
 gpointer
-mono_arch_get_unbox_trampoline (MonoMethod *method, gpointer addr)
+mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *method, gpointer addr)
 {
        guint8 *code, *start;
        int this_pos = s390_r2;
        MonoDomain *domain = mono_domain_get ();
 
        start = addr;
-       if ((!mono_method_signature (method)->ret->byref) &&
-           (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret)))
+       if (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret))
                this_pos = s390_r3;
 
        mono_domain_lock (domain);
@@ -533,30 +533,6 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
 
 /*========================= End of Function ========================*/
 
-/*------------------------------------------------------------------*/
-/*                                                                  */
-/* Name                - mono_debuger_create_notification_function         */
-/*                                                                  */
-/* Function    - This method is only called when running in the    */
-/*                Mono debugger. It returns a pointer to the        */
-/*                arch specific notification function.              */
-/*                                                                  */
-/*------------------------------------------------------------------*/
-
-gpointer
-mono_debugger_create_notification_function (void)
-{
-       guint8 *ptr, *buf;
-
-       ptr = buf = mono_global_codeman_reserve (16);
-       s390_break (buf);
-       s390_br (buf, s390_r14);
-
-       return ptr;
-}
-
-/*========================= End of Function ========================*/
-
 gpointer
 mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
 {
@@ -564,11 +540,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;
-}