diff options
Diffstat (limited to 'mono/mini/tramp-ppc.c')
| -rw-r--r-- | mono/mini/tramp-ppc.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mono/mini/tramp-ppc.c b/mono/mini/tramp-ppc.c index 7391809975..7cec84281e 100644 --- a/mono/mini/tramp-ppc.c +++ b/mono/mini/tramp-ppc.c @@ -22,8 +22,7 @@ #include "mini.h" #include "mini-ppc.h" -static guint8* nullified_class_init_trampoline; - +#if 0 /* Same as mono_create_ftnptr, but doesn't require a domain */ static gpointer mono_ppc_create_ftnptr (guint8 *code) @@ -40,6 +39,7 @@ mono_ppc_create_ftnptr (guint8 *code) return code; #endif } +#endif /* * Return the instruction to jump from code to target, 0 if not @@ -200,16 +200,13 @@ mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *a void mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs) { - mono_arch_patch_callsite (NULL, code, nullified_class_init_trampoline); + mono_arch_patch_callsite (NULL, code, mini_get_nullified_class_init_trampoline ()); } void mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs) { - if (mono_aot_only && !nullified_class_init_trampoline) - nullified_class_init_trampoline = mono_aot_get_trampoline ("nullified_class_init_trampoline"); - - mono_arch_patch_plt_entry (code, NULL, regs, nullified_class_init_trampoline); + mono_arch_patch_plt_entry (code, NULL, regs, mini_get_nullified_class_init_trampoline ()); } /* Stack size for trampoline function @@ -440,11 +437,6 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf /* Sanity check */ g_assert ((code - buf) <= size); - if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT) { - /* Initialize the nullified class init trampoline */ - nullified_class_init_trampoline = mono_ppc_create_ftnptr (mono_arch_get_nullified_class_init_trampoline (NULL)); - } - if (info) { tramp_name = mono_get_generic_trampoline_name (tramp_type); *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops); |