X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftramp-ia64.c;h=c95d26f8fd66c33f49a18513df3daccacef6188c;hb=cb4dfb5d9803365b73db03e34dc9900301b19a80;hp=c93ec7b3c3c01667c22d51ecf47ea1e1c9f7abf9;hpb=3f59a81f59dadb16b52cef247386b4c26f0ce4c6;p=mono.git

diff --git a/mono/mini/tramp-ia64.c b/mono/mini/tramp-ia64.c
index c93ec7b3c3c..c95d26f8fd6 100644
--- a/mono/mini/tramp-ia64.c
+++ b/mono/mini/tramp-ia64.c
@@ -24,7 +24,6 @@
 
 /*
  * mono_arch_get_unbox_trampoline:
- * @gsctx: the generic sharing context
  * @m: method pointer
  * @addr: pointer to native code for @m
  *
@@ -33,7 +32,7 @@
  * unboxing before calling the method
  */
 gpointer
-mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *m, gpointer addr)
+mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 {
 	guint8 *buf;
 	gpointer func_addr, func_gp;
@@ -44,9 +43,6 @@ mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *m,
 
 	/* FIXME: Optimize this */
 
-	if (MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
-		this_reg = 1;
-
 	func_addr = ((gpointer*)addr) [0];
 	func_gp = ((gpointer*)addr) [1];
 
@@ -122,13 +118,13 @@ mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
 }
 
 void
-mono_arch_patch_plt_entry (guint8 *code, gpointer *got, gssize *regs, guint8 *addr)
+mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *addr)
 {
 	g_assert_not_reached ();
 }
 
 void
-mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
+mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs)
 {
 	guint8 *callsite_begin;
 	guint64 *callsite = (guint64*)(gpointer)(code - 16);
@@ -174,13 +170,13 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
 }
 
 void
-mono_arch_nullify_plt_entry (guint8 *code, gssize *regs)
+mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs)
 {
 	g_assert_not_reached ();
 }
 
 guchar*
-mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
+mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInfo **info, gboolean aot)
 {
 	guint8 *buf, *tramp;
 	int i, offset, saved_regs_offset, saved_fpregs_offset, last_offset, framesize;
@@ -190,6 +186,10 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
 	unw_dyn_info_t *di;
 	unw_dyn_region_info_t *r_pro;
 
+	g_assert (!aot);
+	if (info)
+		*info = NULL;
+
 	/* 
 	 * Since jump trampolines are not patched, this trampoline is executed every
 	 * time a call is made to a jump trampoline. So we try to keep things faster
@@ -412,7 +412,7 @@ mono_arch_invalidate_method (MonoJitInfo *ji, void *func, gpointer func_arg)
 }
 
 gpointer
-mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info, gboolean aot)
 {
 	/* FIXME: implement! */
 	g_assert_not_reached ();