2009-03-22 Zoltan Varga <vargaz@gmail.com>

	* mini-amd64.c (mono_arch_build_imt_thunk): Simplify the fail handling
	code somewhat.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 985eca38eb25a5a15f38b98232b94a2b54ef8ce8..86ccde783d4bde347f2180da41c89c9b6d4962f7 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-22  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-amd64.c (mono_arch_build_imt_thunk): Simplify the fail handling
+       code somewhat.
+
 2009-03-21  Mark Probst  <mark.probst@gmail.com>
 
        * cfold.c, cprop.c, decompose.c, genmdesc.c, helpers.c, ir-emit.h,

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 4d59ff69ed7fa94f4a1e07e703af5abdcb1a2bf9..fdab64cb7e7f8084e711078b935c8fd772832684 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -5915,8 +5915,10 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                MonoIMTCheckItem *item = imt_entries [i];
                item->code_target = code;
                if (item->is_equals) {
-                       if (item->check_target_idx) {
-                               if (!item->compare_done) {
+                       gboolean fail_case = !item->check_target_idx && fail_tramp;
+
+                       if (item->check_target_idx || fail_case) {
+                               if (!item->compare_done || fail_case) {
                                        if (amd64_is_imm32 (item->key))
                                                amd64_alu_reg_imm (code, X86_CMP, MONO_ARCH_IMT_REG, (guint32)(gssize)item->key);
                                        else {
@@ -5934,56 +5936,39 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                                        amd64_mov_reg_imm (code, AMD64_R10, & (vtable->vtable [item->value.vtable_slot]));
                                        amd64_jump_membase (code, AMD64_R10, 0);
                                }
-                       } else {
-                               if (fail_tramp) {
-                                       if (amd64_is_imm32 (item->key))
-                                               amd64_alu_reg_imm (code, X86_CMP, MONO_ARCH_IMT_REG, (guint32)(gssize)item->key);
-                                       else {
-                                               amd64_mov_reg_imm (code, AMD64_R10, item->key);
-                                               amd64_alu_reg_reg (code, X86_CMP, MONO_ARCH_IMT_REG, AMD64_R10);
-                                       }
-                                       item->jmp_code = code;
-                                       amd64_branch8 (code, X86_CC_NE, 0, FALSE);
-                                       if (item->has_target_code) {
-                                               amd64_mov_reg_imm (code, AMD64_R10, item->value.target_code);
-                                               amd64_jump_reg (code, AMD64_R10);
-                                       } else {
-                                               g_assert (vtable);
-                                               amd64_mov_reg_imm (code, AMD64_R10, & (vtable->vtable [item->value.vtable_slot]));
-                                               amd64_jump_membase (code, AMD64_R10, 0);
-                                       }
+
+                               if (fail_case) {
                                        amd64_patch (item->jmp_code, code);
                                        amd64_mov_reg_imm (code, AMD64_R10, fail_tramp);
                                        amd64_jump_reg (code, AMD64_R10);
                                        item->jmp_code = NULL;
-                                               
-                               } else {
-                                       /* enable the commented code to assert on wrong method */
+                               }
+                       } else {
+                               /* enable the commented code to assert on wrong method */
 #if 0
-                                       if (amd64_is_imm32 (item->key))
-                                               amd64_alu_reg_imm (code, X86_CMP, MONO_ARCH_IMT_REG, (guint32)(gssize)item->key);
-                                       else {
-                                               amd64_mov_reg_imm (code, AMD64_R10, item->key);
-                                               amd64_alu_reg_reg (code, X86_CMP, MONO_ARCH_IMT_REG, AMD64_R10);
-                                       }
-                                       item->jmp_code = code;
-                                       amd64_branch8 (code, X86_CC_NE, 0, FALSE);
-                                       /* See the comment below about R10 */
-                                       amd64_mov_reg_imm (code, AMD64_R10, & (vtable->vtable [item->value.vtable_slot]));
-                                       amd64_jump_membase (code, AMD64_R10, 0);
-                                       amd64_patch (item->jmp_code, code);
-                                       amd64_breakpoint (code);
-                                       item->jmp_code = NULL;
+                               if (amd64_is_imm32 (item->key))
+                                       amd64_alu_reg_imm (code, X86_CMP, MONO_ARCH_IMT_REG, (guint32)(gssize)item->key);
+                               else {
+                                       amd64_mov_reg_imm (code, AMD64_R10, item->key);
+                                       amd64_alu_reg_reg (code, X86_CMP, MONO_ARCH_IMT_REG, AMD64_R10);
+                               }
+                               item->jmp_code = code;
+                               amd64_branch8 (code, X86_CC_NE, 0, FALSE);
+                               /* See the comment below about R10 */
+                               amd64_mov_reg_imm (code, AMD64_R10, & (vtable->vtable [item->value.vtable_slot]));
+                               amd64_jump_membase (code, AMD64_R10, 0);
+                               amd64_patch (item->jmp_code, code);
+                               amd64_breakpoint (code);
+                               item->jmp_code = NULL;
 #else
-                                       /* We're using R10 here because R11
-                                          needs to be preserved.  R10 needs
-                                          to be preserved for calls which
-                                          require a runtime generic context,
-                                          but interface calls don't. */
-                                       amd64_mov_reg_imm (code, AMD64_R10, & (vtable->vtable [item->value.vtable_slot]));
-                                       amd64_jump_membase (code, AMD64_R10, 0);
+                               /* We're using R10 here because R11
+                                  needs to be preserved.  R10 needs
+                                  to be preserved for calls which
+                                  require a runtime generic context,
+                                  but interface calls don't. */
+                               amd64_mov_reg_imm (code, AMD64_R10, & (vtable->vtable [item->value.vtable_slot]));
+                               amd64_jump_membase (code, AMD64_R10, 0);
 #endif
-                               }
                        }
                } else {
                        if (amd64_is_imm32 (item->key))