Author: zoltan
Date: 2007-07-22 15:30:26 -0400 (Sun, 22 Jul 2007)
New Revision: 82446
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/exceptions-x86.c
trunk/mono/mono/mini/tramp-x86.c
Log:
2007-07-22 Zoltan Varga <[EMAIL PROTECTED]>
* exceptions-x86.c (mono_arch_find_jit_info): Handle the lmf->method ==
NULL
case.
* tramp-x86.c (mono_arch_create_trampoline_code): Only set lmf->method
for
trampolines taking a method argument.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-07-22 18:36:50 UTC (rev 82445)
+++ trunk/mono/mono/mini/ChangeLog 2007-07-22 19:30:26 UTC (rev 82446)
@@ -1,5 +1,11 @@
2007-07-22 Zoltan Varga <[EMAIL PROTECTED]>
+ * exceptions-x86.c (mono_arch_find_jit_info): Handle the lmf->method ==
NULL
+ case.
+
+ * tramp-x86.c (mono_arch_create_trampoline_code): Only set lmf->method
for
+ trampolines taking a method argument.
+
* mini-x86.h (MonoLMF): Add an 'esp' field plus comments.
* mini-x86.c (mono_arch_emit_prolog): Update after changes to the LMF
structure.
Modified: trunk/mono/mono/mini/exceptions-x86.c
===================================================================
--- trunk/mono/mono/mini/exceptions-x86.c 2007-07-22 18:36:50 UTC (rev
82445)
+++ trunk/mono/mono/mini/exceptions-x86.c 2007-07-22 19:30:26 UTC (rev
82446)
@@ -667,7 +667,8 @@
new_ctx->esp = (*lmf)->esp;
/* Pop arguments off the stack */
- {
+ /* FIXME: Handle the delegate case too ((*lmf)->method
== NULL) */
+ if ((*lmf)->method) {
MonoMethod *method = (*lmf)->method;
MonoJitArgumentInfo *arg_info = g_newa
(MonoJitArgumentInfo, mono_method_signature (method)->param_count + 1);
Modified: trunk/mono/mono/mini/tramp-x86.c
===================================================================
--- trunk/mono/mono/mini/tramp-x86.c 2007-07-22 18:36:50 UTC (rev 82445)
+++ trunk/mono/mono/mini/tramp-x86.c 2007-07-22 19:30:26 UTC (rev 82446)
@@ -226,7 +226,10 @@
pushed_args ++;
/* save method info */
- x86_push_membase (buf, X86_ESP, pushed_args * sizeof (gpointer));
+ if ((tramp_type == MONO_TRAMPOLINE_GENERIC) || (tramp_type ==
MONO_TRAMPOLINE_JUMP))
+ x86_push_membase (buf, X86_ESP, pushed_args * sizeof
(gpointer));
+ else
+ x86_push_imm (buf, 0);
pushed_args++;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches