From 2efab0e6a5ce675731928552497afe6f23766745 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 18 Jun 2010 19:57:52 +0000 Subject: [PATCH] 2010-06-18 Zoltan Varga * aot-compiler.c (emit_method_code): Use cfg->header instead of the header of orig_method. * exceptions-amd64.c (mono_arch_exceptions_init): Fix fullaot support. svn path=/trunk/mono/; revision=159148 --- mono/mini/ChangeLog | 5 +++++ mono/mini/aot-compiler.c | 2 +- mono/mini/exceptions-amd64.c | 12 ++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 587ce5de40f..469d0b0de8d 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,10 @@ 2010-06-18 Zoltan Varga + * aot-compiler.c (emit_method_code): Use cfg->header instead of the header of + orig_method. + + * exceptions-amd64.c (mono_arch_exceptions_init): Fix fullaot support. + * mini-llvm.c (process_bb): Add support for OP_SQRT when using the LLVM mono branch. 2010-06-17 Geoff Norton diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index 01e0eb95a3c..93f09007666 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -3082,7 +3082,7 @@ emit_method_code (MonoAotCompile *acfg, MonoCompile *cfg) method = cfg->orig_method; code = cfg->native_code; - header = mono_method_get_header (method); + header = cfg->header; method_index = get_method_index (acfg, method); diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c index 006d59063b7..5fa2062c4d8 100644 --- a/mono/mini/exceptions-amd64.c +++ b/mono/mini/exceptions-amd64.c @@ -1096,14 +1096,14 @@ mono_arch_exceptions_init (void) } else { /* Call this to avoid initialization races */ throw_pending_exception = mono_arch_get_throw_pending_exception (NULL, FALSE); - } - /* LLVM needs different throw trampolines */ - tramp = get_throw_trampoline (NULL, FALSE, TRUE, FALSE, FALSE); - mono_register_jit_icall (tramp, "mono_arch_llvm_throw_corlib_exception", NULL, TRUE); + /* LLVM needs different throw trampolines */ + tramp = get_throw_trampoline (NULL, FALSE, TRUE, FALSE, FALSE); + mono_register_jit_icall (tramp, "mono_arch_llvm_throw_corlib_exception", NULL, TRUE); - tramp = get_throw_trampoline (NULL, FALSE, TRUE, TRUE, FALSE); - mono_register_jit_icall (tramp, "mono_arch_llvm_throw_corlib_exception_abs", NULL, TRUE); + tramp = get_throw_trampoline (NULL, FALSE, TRUE, TRUE, FALSE); + mono_register_jit_icall (tramp, "mono_arch_llvm_throw_corlib_exception_abs", NULL, TRUE); + } } #ifdef TARGET_WIN32 -- 2.25.1