2010-02-15 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / exceptions-ia64.c

diff --git a/mono/mini/exceptions-ia64.c b/mono/mini/exceptions-ia64.c
index 26ef6651f91840007f837a16343c65e3068ce807..a7d04a568487c7697a4afe24b7f24baae939db09 100644 (file)
--- 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
 
@@ -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:
  *
@@ -519,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);
@@ -536,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;
@@ -612,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;
@@ -620,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);