2010-06-22 Zoltan Varga <vargaz@gmail.com>

	* exceptions-amd64.c (get_throw_trampoline): Align the stack properly.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 3e092172beb249e100873084bb202695e4cb57cb..5b95f7251e94baa746559cc9ce7201b1c74f632c 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-22  Zoltan Varga  <vargaz@gmail.com>
 
+       * exceptions-amd64.c (get_throw_trampoline): Align the stack properly.
+
        * mini-amd64.c (mono_arch_emit_exceptions): Pass only the type token index, not
        the type token.
 

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 064dbccb439dd5b583b9b91fdb6cce632534aca9..cf5dbf1fedfbcc05e984c2b7770ac34bc671d690 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -410,7 +410,8 @@ get_throw_trampoline (MonoTrampInfo **info, gboolean rethrow, gboolean corlib, g
        buf_size = 256;
        start = code = mono_global_codeman_reserve (buf_size);
 
-       stack_size = 192;
+       /* The stack is unaligned on entry */
+       stack_size = 192 + 8;
 
        code = start;