From 133c0a02116d65e3f0cbe15e6110f4f210907578 Mon Sep 17 00:00:00 2001 From: neale Date: Tue, 29 Aug 2006 20:32:04 +0000 Subject: [PATCH] * tramp-s390.c: Fix warning * cpu-s390.md: Fix length of mul_imm git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@64522 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/mini/ChangeLog | 4 ++++ mono/mini/cpu-s390.md | 2 +- mono/mini/tramp-s390.c | 4 +--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index ee09a9114..ae2f9d358 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -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 * aot-compiler.c: added binary writer with ELF backend diff --git a/mono/mini/cpu-s390.md b/mono/mini/cpu-s390.md index 7834c03fb..885c2e730 100644 --- a/mono/mini/cpu-s390.md +++ b/mono/mini/cpu-s390.md @@ -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: diff --git a/mono/mini/tramp-s390.c b/mono/mini/tramp-s390.c index 598c5a772..51110ef20 100644 --- 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 */ -- 2.11.4.GIT