* tramp-s390.c: Fix warning
authorNeale Ferguson <neale@mono-cvs.ximian.com>
Tue, 29 Aug 2006 20:32:04 +0000 (20:32 -0000)
committerNeale Ferguson <neale@mono-cvs.ximian.com>
Tue, 29 Aug 2006 20:32:04 +0000 (20:32 -0000)
* cpu-s390.md: Fix length of mul_imm

svn path=/trunk/mono/; revision=64522

mono/mini/ChangeLog
mono/mini/cpu-s390.md
mono/mini/tramp-s390.c

index ee09a91144a87f03ec2083d08b39ea575adb8fad..ae2f9d35851ffe444292244feefa53f794efb3c1 100644 (file)
@@ -5,6 +5,10 @@
 
        * exceptions-s390x.c: Cosmetic change.
 
+       * tramp-s390.c: Fix warning.
+
+       * cpu-s390.md: Correct length of mul_imm.
+
 Wed Aug 23 19:24:00 CEST 2006 Paolo Molaro <lupus@ximian.com>
 
        * aot-compiler.c: added binary writer with ELF backend
index 7834c03fb2edae1a4734327d24e051dace9799a5..885c2e730c4743429107bb3bb51033bce37d8a10 100644 (file)
@@ -412,7 +412,7 @@ move: dest:i src1:i len:4
 mul.ovf.un: dest:i src1:i src2:i len:20
 mul.ovf: dest:i src1:i src2:i len:42
 mul: dest:i src1:i src2:i len:6
-mul_imm: dest:i src1:i len:18
+mul_imm: dest:i src1:i len:20
 neg: dest:i src1:i len:4
 newarr:
 newobj:
index 598c5a77210efadac8ffaaf58ce9f03ba5932f54..51110ef201a3d777b9543246b810ab21cbbd1a1c 100644 (file)
@@ -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 */