X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fexceptions-s390.c;h=a6db38e300c99c808a357b41cc4231c2bf9d74e2;hb=32455dbbe90d3f7826a2bae5a95360e050f04172;hp=618462658581bbd4e1bf28eca3375a43f9110ccb;hpb=53c76f5069b8e4fc017b8fe7fdc990e6f504e2ba;p=mono.git

diff --git a/mono/mini/exceptions-s390.c b/mono/mini/exceptions-s390.c
index 61846265858..a6db38e300c 100644
--- a/mono/mini/exceptions-s390.c
+++ b/mono/mini/exceptions-s390.c
@@ -65,8 +65,7 @@
 /*------------------------------------------------------------------*/
 
 gboolean mono_arch_handle_exception (void     *ctx,
-				     gpointer obj, 
-				     gboolean test_only);
+									 gpointer obj);
 
 /*========================= End of Prototypes ======================*/
 
@@ -76,23 +75,6 @@ gboolean mono_arch_handle_exception (void     *ctx,
 
 /*====================== End of Global Variables ===================*/
 
-/*------------------------------------------------------------------*/
-/*                                                                  */
-/* Name		- mono_arch_has_unwind_info                         */
-/*                                                                  */
-/* Function	- Tests if a function has a DWARF exception table   */
-/*		  that is able to restore all caller saved registers*/
-/*                                                                  */
-/*------------------------------------------------------------------*/
-
-gboolean
-mono_arch_has_unwind_info (gconstpointer addr)
-{
-	return FALSE;
-}
-
-/*========================= End of Function ========================*/
-
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name		- mono_arch_get_call_filter                         */
@@ -246,7 +228,7 @@ throw_exception (MonoObject *exc, unsigned long ip, unsigned long sp,
 		if (!rethrow)
 			mono_ex->stack_trace = NULL;
 	}
-	mono_arch_handle_exception (&ctx, exc, FALSE);
+	mono_arch_handle_exception (&ctx, exc);
 	setcontext(&ctx);
 
 	g_assert_not_reached ();
@@ -449,7 +431,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
 	memset (frame, 0, sizeof (StackFrameInfo));
 	frame->ji = ji;
-	frame->managed = FALSE;
 
 	*new_ctx = *ctx;
 
@@ -458,9 +439,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
 		frame->type = FRAME_TYPE_MANAGED;
 
-		if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-			frame->managed = TRUE;
-
 		if (*lmf && (MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)) {
 			/* remove any unused lmf */
 			*lmf = (*lmf)->previous_lmf;
@@ -510,15 +488,13 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 /*                                                                  */
 /* Parameters   - ctx       - Saved processor state                 */
 /*                obj       - The exception object                  */
-/*                test_only - Only test if the exception is caught, */
-/*                            but don't call handlers               */
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
 gboolean
-mono_arch_handle_exception (void *uc, gpointer obj, gboolean test_only)
+mono_arch_handle_exception (void *uc, gpointer obj)
 {
-	return mono_handle_exception (uc, obj, mono_arch_ip_from_context(uc), test_only);
+	return mono_handle_exception (uc, obj);
 }
 
 /*========================= End of Function ========================*/