Revert "Revert "Refuse to load AOT images using unsupported SIMD instructions""

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

diff --git a/mono/mini/exceptions-hppa.c b/mono/mini/exceptions-hppa.c
index 4b3f191fab11c49ea18bee02d40006391e596ba4..526c7fe33f2338743f5d6ec6dd13e1a89033167b 100644 (file)
--- a/mono/mini/exceptions-hppa.c
+++ b/mono/mini/exceptions-hppa.c
@@ -278,7 +278,7 @@ throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *
                if (!rethrow)
                        mono_ex->stack_trace = NULL;
        }
-       mono_handle_exception (&ctx, exc, (gpointer)(eip + 8), FALSE);
+       mono_handle_exception (&ctx, exc);
 
        restore_context (&ctx);
 
@@ -545,7 +545,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
        if (prev_ji && (ip > 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, ip);
+               ji = mini_jit_info_table_find (domain, ip, NULL);
 
        if (managed)
                *managed = FALSE;
@@ -577,7 +577,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
                if (!(*lmf)->method)
                        return (gpointer)-1;
 
-               if ((ji = mono_jit_info_table_find (domain, (gpointer)(*lmf)->eip))) {
+               if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->eip, NULL))) {
                } else {
                        memset (res, 0, MONO_SIZEOF_JIT_INFO);
                        res->method = (*lmf)->method;
@@ -596,17 +596,11 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
        return NULL;
 }
 
-gboolean
-mono_arch_has_unwind_info (gconstpointer addr)
-{
-       return FALSE;
-}
-
 /*
  * This is the function called from the signal handler
  */
 gboolean
-mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
+mono_arch_handle_exception (void *sigctx, gpointer obj)
 {
        struct ucontext *uc = sigctx;
        MonoContext mctx;
@@ -625,7 +619,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
        }
        g_assert (grs == MONO_SAVED_GREGS && frs == MONO_SAVED_FREGS);
 
-       result = mono_handle_exception (&mctx, obj, (gpointer)mctx.pc, test_only);
+       result = mono_handle_exception (&mctx, obj);
 
        /* restore the context so that returning from the signal handler will invoke
         * the catch clause