2007-10-07 Andreia Gaita <avidigal@novell.com>

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

diff --git a/mono/mini/tramp-s390.c b/mono/mini/tramp-s390.c
index 598c5a77210efadac8ffaaf58ce9f03ba5932f54..59f1403513262bce43ba8739c3cfce5bfebe7f76 100644 (file)
--- a/mono/mini/tramp-s390.c
+++ b/mono/mini/tramp-s390.c
@@ -147,7 +147,6 @@ s390_magic_trampoline (MonoMethod *method, guchar *code, char *sp)
        int reg;
        guchar* base;
        unsigned short opcode;
-       char *fname;
        MonoJitInfo *codeJi, 
                    *addrJi;
 
@@ -160,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)) {
@@ -187,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 */
@@ -611,11 +609,11 @@ mono_arch_create_class_init_trampoline (MonoVTable *vtable)
 /*------------------------------------------------------------------*/
 
 gpointer
-mono_debugger_create_notification_function (MonoCodeManager *codeman)
+mono_debugger_create_notification_function (void)
 {
        guint8 *ptr, *buf;
 
-       ptr = buf = mono_code_manager_reserve (codeman, 16);
+       ptr = buf = mono_global_codeman_reserve (16);
        s390_break (buf);
        s390_br (buf, s390_r14);