X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftramp-ppc.c;h=faecb47d4de845102c506bef722fab3652b24cd2;hb=52e98abd6e5c6d10ddea91a529f7b1b2336e0696;hp=fa684925a78c6b04ff6a262e65717227b8c5c60b;hpb=b17b5f38d672410207727002890219484fca1dc7;p=mono.git diff --git a/mono/mini/tramp-ppc.c b/mono/mini/tramp-ppc.c index fa684925a78..faecb47d4de 100644 --- a/mono/mini/tramp-ppc.c +++ b/mono/mini/tramp-ppc.c @@ -127,7 +127,7 @@ mono_arch_get_static_rgctx_trampoline (gpointer arg, gpointer addr) addr = mono_get_addr_from_ftnptr (addr); - /* Compute size of code needed to emit mrgctx */ + /* Compute size of code needed to emit the arg */ p = imm_buf; ppc_load_ptr (p, MONO_ARCH_RGCTX_REG, arg); imm_size = p - imm_buf; @@ -141,12 +141,12 @@ mono_arch_get_static_rgctx_trampoline (gpointer arg, gpointer addr) mono_domain_unlock (domain); if (short_branch) { - ppc_load_ptr (code, MONO_ARCH_RGCTX_REG, mrgctx); + ppc_load_ptr (code, MONO_ARCH_RGCTX_REG, arg); ppc_emit32 (code, short_branch); } else { ppc_load_ptr (code, ppc_r0, addr); ppc_mtctr (code, ppc_r0); - ppc_load_ptr (code, MONO_ARCH_RGCTX_REG, mrgctx); + ppc_load_ptr (code, MONO_ARCH_RGCTX_REG, arg); ppc_bcctr (code, 20, 0); } mono_arch_flush_icache (start, code - start); @@ -633,3 +633,10 @@ mono_arch_get_plt_info_offset (guint8 *plt_entry, mgreg_t *regs, guint8 *code) return ((guint32*)plt_entry) [6]; #endif } + +gpointer +mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info) +{ + g_assert_not_reached (); + return NULL; +}