2010-02-08 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 87372e0b07aa726aaa6d0a17c2c3d4257e4546f1..a7d04a568487c7697a4afe24b7f24baae939db09 100644 (file)
--- a/mono/mini/exceptions-ia64.c
+++ b/mono/mini/exceptions-ia64.c
@@ -256,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);
 
@@ -386,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:
  *
@@ -535,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;
@@ -611,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;