2009-05-12 Zoltan Varga <vargaz@gmail.com>

	* aot-compiler.c mini.c mini-amd64.h mini-arm.h: Kill
	MONO_ARCH_FULL_AOT_IMT_SUPPORTED define, both platforms now support imt.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index b2547a6f9c5c173bef68564f64f9b4032bac8c61..21bbac69258a992a852bbf4c1f845f952418f244 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-12  Zoltan Varga  <vargaz@gmail.com>
 
+       * aot-compiler.c mini.c mini-amd64.h mini-arm.h: Kill 
+       MONO_ARCH_FULL_AOT_IMT_SUPPORTED define, both platforms now support imt.
+
        * mini.c (mini_init): Install mono_aot_get_imt_thunk as the IMT thunk
        builder when using full aot.
 

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index b5f40512c4616eab70762d1e5a4803df326ca004..bfa9f5de22a43386db5f53f534e8b5b4891c8165 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -3018,11 +3018,6 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
 
        //acfg->aot_opts.print_skipped_methods = TRUE;
 
-#ifndef MONO_ARCH_FULL_AOT_IMT_SUPPORTED
-       if (acfg->aot_opts.full_aot)
-               mono_use_imt = FALSE;
-#endif
-
        /*
         * Since these methods are the only ones which are compiled with
         * AOT support, and they are not used by runtime startup/shutdown code,
@@ -4596,9 +4591,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
 #ifdef MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE
        acfg->num_trampolines [MONO_AOT_TRAMP_STATIC_RGCTX] = acfg->aot_opts.full_aot ? 1024 : 0;
 #endif
-#ifdef MONO_ARCH_FULL_AOT_IMT_SUPPORTED
        acfg->num_trampolines [MONO_AOT_TRAMP_IMT_THUNK] = acfg->aot_opts.full_aot ? 128 : 0;
-#endif
 
        acfg->method_index = 1;
 

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index fc492d48c65f50f1a5f43ba6011b43e0727cdd62..5f622488a4d1e89e2a6cd9e0b199de88685fdda1 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -325,7 +325,6 @@ typedef struct {
 #define MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
-#define MONO_ARCH_FULL_AOT_IMT_SUPPORTED 1
 
 #if !defined(PLATFORM_WIN32) || defined(__sun)
 #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index 18be9fcd0319404ecfc6a9c166ac541b31152609..935143f0a472c9dfd5cb09bfb8d6dd36b4f77842 100644 (file)
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -153,7 +153,6 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
-#define MONO_ARCH_FULL_AOT_IMT_SUPPORTED 1
 
 /* ARM doesn't have too many registers, so we have to use a callee saved one */
 #define MONO_ARCH_RGCTX_REG ARMREG_V5

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 1c92e51d44e50386a485bcfc2e4507402640c8fd..6b5289d6bbd527d7b6a8ebcf890c7096cec6aca9 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -4790,10 +4790,6 @@ mini_init (const char *filename, const char *runtime_version)
                domain = mono_init_from_assembly (filename, filename);
 
        if (mono_aot_only) {
-               /* The IMT tables are very dynamic thus they are hard to AOT */
-#ifndef MONO_ARCH_FULL_AOT_IMT_SUPPORTED
-               mono_use_imt = FALSE;
-#endif
                /* This helps catch code allocation requests */
                mono_code_manager_set_read_only (domain->code_mp);
        }