Author: zoltan
Date: 2007-12-02 08:53:14 -0500 (Sun, 02 Dec 2007)
New Revision: 90521
Modified:
trunk/mono/mono/mini/aot-compiler.c
trunk/mono/mono/mini/aot-runtime.c
trunk/mono/mono/mini/mini.c
trunk/mono/mono/mini/patch-info.h
Log:
2007-12-02 Zoltan Varga <[EMAIL PROTECTED]>
* patch-info.h (PATCH_INFO): Add DELEGATE_TRAMPOLINE.
* mini.c aot-compiler.c aot-runtime.c: Implement the delegate creation
optimization in the AOT case.
Modified: trunk/mono/mono/mini/aot-compiler.c
===================================================================
--- trunk/mono/mono/mini/aot-compiler.c 2007-12-02 12:31:57 UTC (rev 90520)
+++ trunk/mono/mono/mini/aot-compiler.c 2007-12-02 13:53:14 UTC (rev 90521)
@@ -2070,6 +2070,7 @@
}
break;
case MONO_PATCH_INFO_CLASS_INIT:
+ case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
encode_klass_ref (acfg, patch_info->data.klass, p, &p);
break;
case MONO_PATCH_INFO_FIELD:
@@ -2784,6 +2785,7 @@
break;
case MONO_PATCH_INFO_VTABLE:
case MONO_PATCH_INFO_CLASS_INIT:
+ case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
case MONO_PATCH_INFO_CLASS:
case MONO_PATCH_INFO_IID:
case MONO_PATCH_INFO_ADJUSTED_IID:
Modified: trunk/mono/mono/mini/aot-runtime.c
===================================================================
--- trunk/mono/mono/mini/aot-runtime.c 2007-12-02 12:31:57 UTC (rev 90520)
+++ trunk/mono/mono/mini/aot-runtime.c 2007-12-02 13:53:14 UTC (rev 90521)
@@ -1282,6 +1282,7 @@
}
break;
case MONO_PATCH_INFO_CLASS_INIT:
+ case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
ji->data.klass = decode_klass_ref (aot_module, p, &p);
if (!ji->data.klass)
goto cleanup;
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-12-02 12:31:57 UTC (rev 90520)
+++ trunk/mono/mono/mini/mini.c 2007-12-02 13:53:14 UTC (rev 90521)
@@ -173,6 +173,7 @@
static CRITICAL_SECTION jit_mutex;
static GHashTable *class_init_hash_addr = NULL;
+static GHashTable *delegate_trampoline_hash_addr = NULL;
static MonoCodeManager *global_codeman = NULL;
@@ -3131,7 +3132,7 @@
ins->inst_right = offset_ins;
trampoline = mono_create_delegate_trampoline (klass);
- NEW_PCONST (cfg, tramp_ins, trampoline);
+ NEW_AOTCONST (cfg, tramp_ins, MONO_PATCH_INFO_ABS, trampoline);
MONO_INST_NEW (cfg, store, CEE_STIND_I);
store->cil_code = ip;
@@ -7942,9 +7943,8 @@
* Optimize the common case of ldftn+delegate
creation
*/
#if defined(MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE) &&
!defined(HAVE_WRITE_BARRIERS)
- /* FIXME: AOT */
/* FIXME: SGEN support */
- if ((sp > stack_start) && (ip + 6 + 5 < end) &&
ip_in_bb (cfg, bblock, ip + 6) && (ip [6] == CEE_NEWOBJ) && (ctor_method =
mini_get_method (method, read32 (ip + 7), NULL, generic_context)) &&
(ctor_method->klass->parent == mono_defaults.multicastdelegate_class) &&
!cfg->compile_aot) {
+ if ((sp > stack_start) && (ip + 6 + 5 < end) &&
ip_in_bb (cfg, bblock, ip + 6) && (ip [6] == CEE_NEWOBJ) && (ctor_method =
mini_get_method (method, read32 (ip + 7), NULL, generic_context)) &&
(ctor_method->klass->parent == mono_defaults.multicastdelegate_class)) {
MonoInst *target_ins;
ip += 6;
@@ -8834,6 +8834,12 @@
klass, ptr);
mono_domain_unlock (domain);
+ mono_jit_lock ();
+ if (!delegate_trampoline_hash_addr)
+ delegate_trampoline_hash_addr = g_hash_table_new (NULL, NULL);
+ g_hash_table_insert (delegate_trampoline_hash_addr, ptr, klass);
+ mono_jit_unlock ();
+
return ptr;
#else
return NULL;
@@ -8854,6 +8860,20 @@
return res;
}
+static MonoClass*
+mono_find_delegate_trampoline_by_addr (gconstpointer addr)
+{
+ MonoClass *res;
+
+ mono_jit_lock ();
+ if (delegate_trampoline_hash_addr)
+ res = g_hash_table_lookup (delegate_trampoline_hash_addr, addr);
+ else
+ res = NULL;
+ mono_jit_unlock ();
+ return res;
+}
+
static void
mono_dynamic_code_hash_insert (MonoDomain *domain, MonoMethod *method,
MonoJitDynamicMethodInfo *ji)
{
@@ -9763,6 +9783,9 @@
case MONO_PATCH_INFO_CLASS_INIT:
target = mono_create_class_init_trampoline (mono_class_vtable
(domain, patch_info->data.klass));
break;
+ case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
+ target = mono_create_delegate_trampoline
(patch_info->data.klass);
+ break;
case MONO_PATCH_INFO_SFLDA: {
MonoVTable *vtable = mono_class_vtable (domain,
patch_info->data.field->parent);
if (!vtable->initialized && !(vtable->klass->flags &
TYPE_ATTRIBUTE_BEFORE_FIELD_INIT) && (method && mono_class_needs_cctor_run
(vtable->klass, method)))
@@ -10844,6 +10867,12 @@
if (vtable) {
patch_info->type =
MONO_PATCH_INFO_CLASS_INIT;
patch_info->data.klass = vtable->klass;
+ } else {
+ MonoClass *klass =
mono_find_delegate_trampoline_by_addr (patch_info->data.target);
+ if (klass) {
+ patch_info->type =
MONO_PATCH_INFO_DELEGATE_TRAMPOLINE;
+ patch_info->data.klass = klass;
+ }
}
}
break;
@@ -12967,6 +12996,8 @@
g_hash_table_destroy (jit_icall_name_hash);
if (class_init_hash_addr)
g_hash_table_destroy (class_init_hash_addr);
+ if (delegate_trampoline_hash_addr)
+ g_hash_table_destroy (delegate_trampoline_hash_addr);
g_free (emul_opcode_map);
mono_arch_cleanup ();
Modified: trunk/mono/mono/mini/patch-info.h
===================================================================
--- trunk/mono/mono/mini/patch-info.h 2007-12-02 12:31:57 UTC (rev 90520)
+++ trunk/mono/mono/mini/patch-info.h 2007-12-02 13:53:14 UTC (rev 90521)
@@ -29,4 +29,5 @@
PATCH_INFO(GOT_OFFSET, "got_offset")
PATCH_INFO(DECLSEC, "declsec")
PATCH_INFO(RVA, "rva")
+PATCH_INFO(DELEGATE_TRAMPOLINE, "delegate_trampoline")
PATCH_INFO(NONE, "none")
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches