diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 53634e60d5a..cd996d4c51a 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,8 @@ 2009-05-04 Zoltan Varga + * aot-runtime.c (load_method): Kill the old and bit-rotten use_loaded_code + option. + * mini-.h mini-trampolines.c aot-runtime.c: Kill the MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN define. diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c index e958e4f40fd..c3c6240e550 100644 --- a/mono/mini/aot-runtime.c +++ b/mono/mini/aot-runtime.c @@ -151,15 +151,6 @@ static CRITICAL_SECTION aot_mutex; */ static GHashTable *static_aot_modules; -/* - * Disabling this will make a copy of the loaded code and use the copy instead - * of the original. This will place the caller and the callee close to each - * other in memory, possibly improving cache behavior. Since the original - * code is in copy-on-write memory, this will not increase the memory usage - * of the runtime. - */ -static gboolean use_loaded_code = TRUE; - /* * Whenever to AOT compile loaded assemblies on demand and store them in * a cache under $HOME/.mono/aot-cache. @@ -2054,20 +2045,6 @@ load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoImage *image, Mo klass = decode_klass_ref (aot_module, p, &p); } - if (!use_loaded_code) { - guint8 *code2; - - if (!jinfo) { - ex_info = &aot_module->ex_info [aot_module->ex_info_offsets [mono_metadata_token_index (token) - 1]]; - jinfo = decode_exception_debug_info (aot_module, domain, method, ex_info, code); - } - - code2 = mono_domain_code_reserve (domain, jinfo->code_size); - memcpy (code2, code, jinfo->code_size); - mono_arch_flush_icache (code2, jinfo->code_size); - code = code2; - } - if (aot_module->opts & MONO_OPT_SHARED) used_strings = decode_value (p, &p); else