X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fexceptions-ia64.c;h=a7d04a568487c7697a4afe24b7f24baae939db09;hb=07178b9c886ac087f6785d3fc593bfa98d169082;hp=0399356f03371ebd5978e6be1a231b8817625d44;hpb=c4aef31eeea309e6a795c84c098ac8e1a2490340;p=mono.git

diff --git a/mono/mini/exceptions-ia64.c b/mono/mini/exceptions-ia64.c
index 0399356f033..a7d04a56848 100644
--- a/mono/mini/exceptions-ia64.c
+++ b/mono/mini/exceptions-ia64.c
@@ -37,8 +37,6 @@
 
 #define ALIGN_TO(val,align) (((val) + ((align) - 1)) & ~((align) - 1))
 
-#define NOT_IMPLEMENTED g_assert_not_reached ()
-
 #define GP_SCRATCH_REG 31
 #define GP_SCRATCH_REG2 30
 
@@ -101,8 +99,8 @@ static gpointer
 get_real_call_filter (void)
 {
 	static gpointer filter;
+	static gboolean inited = FALSE;
 	guint8 *start;
-	gboolean inited = FALSE;
 	Ia64CodegenState code;
 	int in0, local0, out0, nout;
 	unw_dyn_info_t *di;
@@ -258,7 +256,7 @@ throw_exception (MonoObject *exc, guint64 rethrow)
 		res = unw_get_reg (&ctx.cursor, UNW_IA64_SP, &sp);
 		g_assert (res == 0);
 
-		ji = mono_jit_info_table_find (mono_domain_get (), (gpointer)ip);
+		ji = mini_jit_info_table_find (mono_domain_get (), (gpointer)ip, NULL);
 
 		//printf ("UN: %s %lx %lx\n", ji ? ji->method->name : "", ip, sp);
 
@@ -276,6 +274,7 @@ throw_exception (MonoObject *exc, guint64 rethrow)
 		}
 		g_assert (res >= 0);
 	}
+	ctx.precise_ip = FALSE;
 
 	mono_handle_exception (&ctx, exc, (gpointer)(ip), FALSE);
 	restore_context (&ctx);
@@ -387,26 +386,6 @@ mono_arch_get_rethrow_exception (void)
 	return start;
 }
 
-gpointer 
-mono_arch_get_throw_exception_by_name (void)
-{	
-	guint8* start;
-	Ia64CodegenState code;
-
-	start = mono_global_codeman_reserve (64);
-
-	/* Not used on ia64 */
-	ia64_codegen_init (code, start);
-	ia64_break_i (code, 1001);
-	ia64_codegen_close (code);
-
-	g_assert ((code.buf - start) <= 256);
-
-	mono_arch_flush_icache (start, code.buf - start);
-
-	return start;
-}
-
 /**
  * mono_arch_get_throw_corlib_exception:
  *
@@ -420,8 +399,9 @@ mono_arch_get_throw_exception_by_name (void)
 gpointer 
 mono_arch_get_throw_corlib_exception (void)
 {
-	static guint8* start;
+	static guint8* res;
 	static gboolean inited = FALSE;
+	guint8 *start;
 	gpointer ptr;
 	int i, in0, local0, out0, nout;
 	Ia64CodegenState code;
@@ -429,7 +409,7 @@ mono_arch_get_throw_corlib_exception (void)
 	unw_dyn_region_info_t *r_pro;
 
 	if (inited)
-		return start;
+		return res;
 
 	start = mono_global_codeman_reserve (1024);
 
@@ -501,7 +481,10 @@ mono_arch_get_throw_corlib_exception (void)
 
 	mono_arch_flush_icache (start, code.buf - start);
 
-	return ia64_create_ftnptr (start);
+	res = ia64_create_ftnptr (start);
+	inited = TRUE;
+
+	return res;
 }
 
 /* mono_arch_find_jit_info:
@@ -515,14 +498,14 @@ mono_arch_get_throw_corlib_exception (void)
  */
 MonoJitInfo *
 mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *res, MonoJitInfo *prev_ji, MonoContext *ctx, 
-			 MonoContext *new_ctx, char **trace, MonoLMF **lmf, int *native_offset,
-			 gboolean *managed)
+			 MonoContext *new_ctx, MonoLMF **lmf, gboolean *managed)
 {
 	MonoJitInfo *ji;
 	int err;
 	unw_word_t ip;
 
 	*new_ctx = *ctx;
+	new_ctx->precise_ip = FALSE;
 
 	while (TRUE) {
 		err = unw_get_reg (&new_ctx->cursor, UNW_IA64_IP, &ip);
@@ -532,7 +515,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
 		if (prev_ji && ((guint8*)ip > (guint8*)prev_ji->code_start && ((guint8*)ip < ((guint8*)prev_ji->code_start) + prev_ji->code_size)))
 			ji = prev_ji;
 		else
-			ji = mono_jit_info_table_find (domain, (gpointer)ip);
+			ji = mini_jit_info_table_find (domain, (gpointer)ip, NULL);
 
 		if (managed)
 			*managed = FALSE;
@@ -608,7 +591,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
 		res = unw_get_reg (&ctx.cursor, UNW_IA64_IP, &ip);
 		g_assert (res == 0);
 
-		ji = mono_jit_info_table_find (mono_domain_get (), (gpointer)ip);
+		ji = mini_jit_info_table_find (mono_domain_get (), (gpointer)ip, NULL);
 
 		if (ji)
 			break;
@@ -616,6 +599,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
 		res = unw_step (&ctx.cursor);
 		g_assert (res >= 0);
 	}
+	ctx.precise_ip = TRUE;
 
 	mono_handle_exception (&ctx, obj, (gpointer)ip, test_only);