Mon Oct 15 10:37:15 CEST 2007 Paolo Molaro <lupus@ximian.com>

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

diff --git a/mono/mini/tramp-s390.c b/mono/mini/tramp-s390.c
index e84f11284d899eb69db58bce453ee512ceff6acf..59f1403513262bce43ba8739c3cfce5bfebe7f76 100644 (file)
--- a/mono/mini/tramp-s390.c
+++ b/mono/mini/tramp-s390.c
@@ -48,7 +48,6 @@
 #include <mono/metadata/marshal.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/arch/s390/s390-codegen.h>
-#include <mono/metadata/mono-debug-debugger.h>
 
 #include "mini.h"
 #include "mini-s390.h"
@@ -148,7 +147,6 @@ s390_magic_trampoline (MonoMethod *method, guchar *code, char *sp)
        int reg;
        guchar* base;
        unsigned short opcode;
-       char *fname;
        MonoJitInfo *codeJi, 
                    *addrJi;
 
@@ -161,7 +159,6 @@ s390_magic_trampoline (MonoMethod *method, guchar *code, char *sp)
                /* The top bit needs to be ignored on S/390 */
                code = (guchar*)((guint32)code & 0x7fffffff);
 
-               fname  = mono_method_full_name (method, TRUE);
                codeJi = mono_jit_info_table_find (mono_domain_get(), code);
                addrJi = mono_jit_info_table_find (mono_domain_get(), addr);
                if (mono_method_same_domain (codeJi, addrJi)) {
@@ -188,7 +185,7 @@ s390_magic_trampoline (MonoMethod *method, guchar *code, char *sp)
                                code = base + displace;
                                if (mono_domain_owns_vtable_slot(mono_domain_get(), 
                                                                 code))
-                                       s390_patch(code, addr);
+                                       s390_patch(code, (guint32) addr);
                                break;
                        case 0xc0e5 :
                                /* This is the 'brasl' instruction */
@@ -612,14 +609,12 @@ mono_arch_create_class_init_trampoline (MonoVTable *vtable)
 /*------------------------------------------------------------------*/
 
 gpointer
-mono_debugger_create_notification_function (gpointer *notification_address)
+mono_debugger_create_notification_function (void)
 {
        guint8 *ptr, *buf;
 
        ptr = buf = mono_global_codeman_reserve (16);
        s390_break (buf);
-       if (notification_address)
-               *notification_address = buf;
        s390_br (buf, s390_r14);
 
        return ptr;