Author: zoltan
Date: 2007-12-20 14:26:25 -0500 (Thu, 20 Dec 2007)
New Revision: 91733
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/tramp-amd64.c
trunk/mono/mono/mini/tramp-x86.c
Log:
2007-12-20 Zoltan Varga <[EMAIL PROTECTED]>
* 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/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-12-20 18:55:43 UTC (rev 91732)
+++ trunk/mono/mono/mini/ChangeLog 2007-12-20 19:26:25 UTC (rev 91733)
@@ -1,5 +1,9 @@
2007-12-20 Zoltan Varga <[EMAIL PROTECTED]>
+ * tramp-amd64.c (mono_arch_create_trampoline_code): Ditto.
+
+ * tramp-x86.c (mono_arch_create_trampoline_code): Check for thread
interruption.
+
* cpu-amd64.md mini-amd64.h mini-amd64.c inssel-amd64.brg: Add
ulong->double
implementation.
Modified: trunk/mono/mono/mini/tramp-amd64.c
===================================================================
--- trunk/mono/mono/mini/tramp-amd64.c 2007-12-20 18:55:43 UTC (rev 91732)
+++ trunk/mono/mono/mini/tramp-amd64.c 2007-12-20 19:26:25 UTC (rev 91733)
@@ -175,7 +175,7 @@
mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
{
guint8 *buf, *code, *tramp, *br [2];
- int i, lmf_offset, offset, arg_offset, tramp_offset, saved_regs_offset,
saved_fpregs_offset, framesize;
+ int i, lmf_offset, offset, res_offset, arg_offset, tramp_offset,
saved_regs_offset, saved_fpregs_offset, framesize;
gboolean has_caller;
if (tramp_type == MONO_TRAMPOLINE_JUMP)
@@ -221,6 +221,9 @@
amd64_mov_membase_imm (code, AMD64_RBP, tramp_offset, 0, 8);
}
+ offset += 8;
+ res_offset = - offset;
+
/* Save all registers */
offset += AMD64_NREG * 8;
@@ -322,6 +325,13 @@
amd64_mov_reg_imm (code, AMD64_RAX, tramp);
amd64_call_reg (code, AMD64_RAX);
+ /* Check for thread interruption */
+ /* This is not perf critical code so no need to check the interrupt
flag */
+ amd64_mov_membase_reg (code, AMD64_RBP, res_offset, AMD64_RAX, 8);
+ amd64_mov_reg_imm (code, AMD64_RAX,
(guint8*)mono_thread_interruption_checkpoint);
+ amd64_call_reg (code, AMD64_RAX);
+ amd64_mov_reg_membase (code, AMD64_RAX, AMD64_RBP, res_offset, 8);
+
/* Restore LMF */
amd64_mov_reg_membase (code, AMD64_RCX, AMD64_RBP, lmf_offset +
G_STRUCT_OFFSET (MonoLMF, previous_lmf), 8);
Modified: trunk/mono/mono/mini/tramp-x86.c
===================================================================
--- trunk/mono/mono/mini/tramp-x86.c 2007-12-20 18:55:43 UTC (rev 91732)
+++ trunk/mono/mono/mini/tramp-x86.c 2007-12-20 19:26:25 UTC (rev 91733)
@@ -303,12 +303,19 @@
x86_breakpoint (buf);*/
#endif
- tramp = mono_get_trampoline_func (tramp_type);
+ tramp = (guint8*)mono_get_trampoline_func (tramp_type);
x86_call_code (buf, tramp);
x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 4*4);
- /* restore LMF start */
+ /* Check for thread interruption */
+ /* This is not perf critical code so no need to check the interrupt
flag */
+ x86_push_reg (buf, X86_EAX);
+ x86_call_code (buf, (guint8*)mono_thread_interruption_checkpoint);
+ x86_pop_reg (buf, X86_EAX);
+
+ /* Restore LMF */
+
/* ebx = previous_lmf */
x86_pop_reg (buf, X86_EBX);
x86_alu_reg_imm (buf, X86_SUB, X86_EBX, 1);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches