X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fexceptions-s390x.c;h=38c4a5b987a41747ecbe637cb7c217b1372029c6;hb=96edd46e16619fe64e26ea017330c22bf893f0dd;hp=c46265b7fe45818adcf2a739abf8958b35d5ea70;hpb=261e0ba03b1220de78dad6882270e7ca14b88069;p=mono.git

diff --git a/mono/mini/exceptions-s390x.c b/mono/mini/exceptions-s390x.c
index c46265b7fe4..38c4a5b987a 100644
--- a/mono/mini/exceptions-s390x.c
+++ b/mono/mini/exceptions-s390x.c
@@ -213,7 +213,7 @@ mono_arch_get_call_filter (MonoTrampInfo **info, gboolean aot)
 	g_assert ((code - start) < SZ_THROW); 
 
 	if (info)
-		*info = mono_tramp_info_create (g_strdup_printf("call_filter"),
+		*info = mono_tramp_info_create ("call_filter",
 						start, code - start, ji,
 						unwind_ops);
 
@@ -237,11 +237,7 @@ throw_exception (MonoObject *exc, unsigned long ip, unsigned long sp,
 {
 	MonoContext ctx;
 	int iReg;
-	static void (*restore_context) (MonoContext *);
 
-	if (!restore_context)
-		restore_context = mono_get_restore_context();
-	
 	memset(&ctx, 0, sizeof(ctx));
 
 	setup_context(&ctx);
@@ -267,7 +263,7 @@ throw_exception (MonoObject *exc, unsigned long ip, unsigned long sp,
 	}
 //	mono_arch_handle_exception (&ctx, exc, FALSE);
 	mono_handle_exception (&ctx, exc);
-	restore_context(&ctx);
+	mono_restore_context(&ctx);
 
 	g_assert_not_reached ();
 }
@@ -364,9 +360,9 @@ mono_arch_get_throw_exception_generic (int size, MonoTrampInfo **info,
 	g_assert ((code - start) < size);
 
 	if (info)
-		*info = mono_tramp_info_create (g_strdup_printf(corlib ? "throw_corlib_exception" 
+		*info = mono_tramp_info_create (corlib ? "throw_corlib_exception" 
 								       : (rethrow ? "rethrow_exception" 
-								       : "throw_exception")), 
+								       : "throw_exception"), 
 						start, code - start, ji, unwind_ops);
 
 	return start;
@@ -476,10 +472,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
 		frame->type = FRAME_TYPE_MANAGED;
 
-		if (ji->from_aot)
-			unwind_info = mono_aot_get_unwind_info(ji, &unwind_info_len);
-		else
-			unwind_info = mono_get_cached_unwind_info(ji->used_regs, &unwind_info_len);
+		unwind_info = mono_jinfo_get_unwind_info (ji, &unwind_info_len);
 
 		if (*lmf && ((*lmf) != jit_tls->first_lmf) && 
 		    (MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)) {