Author: zoltan
Date: 2007-12-07 10:06:03 -0500 (Fri, 07 Dec 2007)
New Revision: 90937
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/tramp-ppc.c
Log:
2007-12-07 Zoltan Varga <[EMAIL PROTECTED]>
* tramp-ppc.c (mono_arch_create_trampoline_code): Use the new helper
function.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-12-07 15:05:24 UTC (rev 90936)
+++ trunk/mono/mono/mini/ChangeLog 2007-12-07 15:06:03 UTC (rev 90937)
@@ -1,5 +1,7 @@
2007-12-07 Zoltan Varga <[EMAIL PROTECTED]>
+ * tramp-ppc.c (mono_arch_create_trampoline_code): Use the new helper
function.
+
* mini-trampolines.c (mono_get_trampoline_func): New helper function.
* tramp-<ARCH>.c: Use the new helper function.
Modified: trunk/mono/mono/mini/tramp-ppc.c
===================================================================
--- trunk/mono/mono/mini/tramp-ppc.c 2007-12-07 15:05:24 UTC (rev 90936)
+++ trunk/mono/mono/mini/tramp-ppc.c 2007-12-07 15:06:03 UTC (rev 90937)
@@ -255,16 +255,7 @@
/* Arg 3: MonoMethod *method. It was put in r5 already above */
/*ppc_mr (buf, ppc_r5, ppc_r5);*/
- if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT)
- tramp_handler = mono_class_init_trampoline;
- else if (tramp_type == MONO_TRAMPOLINE_AOT)
- tramp_handler = mono_aot_trampoline;
- else if (tramp_type == MONO_TRAMPOLINE_AOT_PLT)
- tramp_handler = mono_aot_plt_trampoline;
- else if (tramp_type == MONO_TRAMPOLINE_DELEGATE)
- tramp_handler = mono_delegate_trampoline;
- else
- tramp_handler = mono_magic_trampoline;
+ tramp_handler = mono_get_trampoline_func (tramp_type);
ppc_lis (buf, ppc_r0, (guint32) tramp_handler >> 16);
ppc_ori (buf, ppc_r0, ppc_r0, (guint32) tramp_handler &
0xffff);
ppc_mtlr (buf, ppc_r0);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
