Author: zoltan
Date: 2007-12-20 14:43:17 -0500 (Thu, 20 Dec 2007)
New Revision: 91735

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/tramp-ia64.c
   trunk/mono/mono/mini/tramp-sparc.c
Log:
2007-12-20  Zoltan Varga  <[EMAIL PROTECTED]>

        * tramp-ia64.c (mono_arch_create_trampoline_code): Ditto.

        * tramp-sparc.c (mono_arch_create_trampoline_code): Check for thread 
interruption.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-12-20 19:27:25 UTC (rev 91734)
+++ trunk/mono/mono/mini/ChangeLog      2007-12-20 19:43:17 UTC (rev 91735)
@@ -1,5 +1,9 @@
 2007-12-20  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * tramp-ia64.c (mono_arch_create_trampoline_code): Ditto.
+
+       * tramp-sparc.c (mono_arch_create_trampoline_code): Check for thread 
interruption.
+
        * tramp-amd64.c (mono_arch_create_trampoline_code): Ditto.
 
        * tramp-x86.c (mono_arch_create_trampoline_code): Check for thread 
interruption.

Modified: trunk/mono/mono/mini/tramp-ia64.c
===================================================================
--- trunk/mono/mono/mini/tramp-ia64.c   2007-12-20 19:27:25 UTC (rev 91734)
+++ trunk/mono/mono/mini/tramp-ia64.c   2007-12-20 19:43:17 UTC (rev 91735)
@@ -324,6 +324,19 @@
        ia64_ld8 (code, IA64_GP, l0);
        ia64_br_call_reg (code, 0, IA64_B6);
 
+       /* Check for thread interruption */
+       /* This is not perf critical code so no need to check the interrupt 
flag */
+       ia64_mov (code, l2, IA64_R8);
+
+       tramp = (guint8*)mono_thread_interruption_checkpoint;
+       ia64_movl (code, l0, tramp);
+       ia64_ld8_inc_imm (code, l1, l0, 8);
+       ia64_mov_to_br (code, IA64_B6, l1);
+       ia64_ld8 (code, IA64_GP, l0);
+       ia64_br_call_reg (code, 0, IA64_B6);
+
+       ia64_mov (code, IA64_R8, l2);
+
        /* Restore fp regs */
        ia64_adds_imm (code, l1, saved_fpregs_offset, IA64_SP);
        for (i = 0; i < 8; ++i)

Modified: trunk/mono/mono/mini/tramp-sparc.c
===================================================================
--- trunk/mono/mono/mini/tramp-sparc.c  2007-12-20 19:27:25 UTC (rev 91734)
+++ trunk/mono/mono/mini/tramp-sparc.c  2007-12-20 19:43:17 UTC (rev 91735)
@@ -180,6 +180,11 @@
        /* Save result */
        sparc_sti_imm (code, sparc_o0, sparc_sp, MONO_SPARC_STACK_BIAS + 304);
 
+       /* Check for thread interruption */
+       sparc_set (code, (guint8*)mono_thread_interruption_checkpoint, 
sparc_o7);
+       sparc_jmpl (code, sparc_o7, sparc_g0, sparc_o7);
+       sparc_nop (code);
+
        /* Restore lmf */
        code = mono_sparc_emit_restore_lmf (code, lmf_offset);
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to