2009-06-09 Zoltan Varga <vargaz@gmail.com>

	* aot-runtime.c (mono_aot_plt_resolve): Avoid creating trampolines in
	the full-aot case if possible, since the trampoline will be called right
	away.

	* aot-compiler.c (mono_compile_assembly): Decrease the number of full aot
	trampolines to 1024 after the change above.

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

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 6566e796590f8cf50aeb8329337c88e299ff9f3c..3899302c93297f232c389c5b937bcce00c24396a 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -67,7 +67,6 @@
 #include "mini-gc.h"
 
 static gpointer mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt);
-static gpointer mono_jit_compile_method (MonoMethod *method);
 
 /* helper methods signature */
 /* FIXME: Make these static again */
@@ -4243,7 +4242,7 @@ mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt)
        return p;
 }
 
-static gpointer
+gpointer
 mono_jit_compile_method (MonoMethod *method)
 {
        return mono_jit_compile_method_with_opt (method, default_opt);

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 73734b3f762eda7865453c3eb69c0f82f88ba045..8e0ee83f963867765aa6862a956a9b6a3a8387c6 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -1341,6 +1341,7 @@ MonoJumpInfo *mono_patch_info_list_prepend  (MonoJumpInfo *list, int ip, MonoJum
 gpointer  mono_resolve_patch_target         (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *patch_info, gboolean run_cctors) MONO_INTERNAL;
 gpointer  mono_jit_find_compiled_method_with_jit_info (MonoDomain *domain, MonoMethod *method, MonoJitInfo **ji) MONO_INTERNAL;
 gpointer  mono_jit_find_compiled_method     (MonoDomain *domain, MonoMethod *method) MONO_INTERNAL;
+gpointer  mono_jit_compile_method           (MonoMethod *method) MONO_INTERNAL;
 MonoLMF * mono_get_lmf                      (void) MONO_INTERNAL;
 MonoLMF** mono_get_lmf_addr                 (void) MONO_INTERNAL;
 void      mono_jit_thread_attach            (MonoDomain *domain);