2005-09-11 Zoltan Varga <vargaz@freemail.hu>

	* tramp-amd64.c (mono_arch_create_trampoline_code): Fix saving of
	method info into the LMF.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index a351edcaad77a1841460785511f78bdfc2ba2dd6..1f42d900d28e3c77f4bcd29033e9bf896b648c84 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,10 @@
-2005-09-11  Zoltan Varga  <vargaz@gmail.com>
+2005-09-11  Zoltan Varga  <vargaz@freemail.hu>
+
+       * tramp-amd64.c (mono_arch_create_trampoline_code): Fix saving of
+       method info into the LMF.
 
+2005-09-11  Zoltan Varga  <vargaz@gmail.com>
+       
        * mini-ia64.c: Add proper unwind info for method epilogs.
 
        * exceptions-ia64.c: Add some code to help debugging.

diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
index 802ba82bb7356cb9bde7b0ca11e9264eb186eca2..02f10e630e9b66d1871e04b39a3b4c9e39d52a2f 100644 (file)
--- a/mono/mini/tramp-amd64.c
+++ b/mono/mini/tramp-amd64.c
@@ -235,10 +235,7 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
        /* Save fp */
        amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ebp), AMD64_RBP, 8);
        /* Save method */
-       if (tramp_type == MONO_TRAMPOLINE_GENERIC)
-               amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, method_offset, 8);
-       else
-               amd64_mov_reg_imm (code, AMD64_R11, 0);
+       amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, method_offset, 8);
        amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), AMD64_R11, 8);
        /* Save callee saved regs */
        amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rbx), AMD64_RBX, 8);