From 284a6ad5ffc8f65118f059951a40917e66c46d35 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sun, 4 Jul 2010 22:31:28 +0000 Subject: [PATCH] 2010-07-05 Zoltan Varga * aot-compiler.c (arch_emit_unbox_trampoline): Fix this after the callconv changes. svn path=/trunk/mono/; revision=159868 --- mono/mini/ChangeLog | 4 ++++ mono/mini/aot-compiler.c | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 245ab474703..0af69d6c6ea 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,7 @@ +2010-07-05 Zoltan Varga + + * aot-compiler.c (arch_emit_unbox_trampoline): Fix this after the callconv changes. + 2010-07-04 Zoltan Varga * tramp-arm.c (mono_arch_create_generic_trampoline): Fix the max trampoline diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index f719e1e8f5f..2976f393582 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -882,9 +882,6 @@ arch_emit_unbox_trampoline (MonoAotCompile *acfg, MonoMethod *method, MonoGeneri guint8 *code; int this_pos = 4; - if (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret)) - this_pos = 8; - code = buf; x86_alu_membase_imm (code, X86_ADD, X86_ESP, this_pos, sizeof (MonoObject)); @@ -897,14 +894,10 @@ arch_emit_unbox_trampoline (MonoAotCompile *acfg, MonoMethod *method, MonoGeneri #elif defined(TARGET_ARM) guint8 buf [128]; guint8 *code; - int this_pos = 0; code = buf; - if (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret)) - this_pos = 1; - - ARM_ADD_REG_IMM8 (code, this_pos, this_pos, sizeof (MonoObject)); + ARM_ADD_REG_IMM8 (code, ARMREG_R0, ARMREG_R0, sizeof (MonoObject)); emit_bytes (acfg, buf, code - buf); /* jump to method */ -- 2.25.1