2009-10-24 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/exceptions-sparc.c b/mono/mini/exceptions-sparc.c
index fb0eedfaa088c3f812f251f63af40c261d758731..39ffeae899c97958b6598723f388d3cf78c3966e 100644 (file)
--- a/mono/mini/exceptions-sparc.c
+++ b/mono/mini/exceptions-sparc.c
@@ -59,6 +59,8 @@ mono_arch_get_restore_context (void)
 
        g_assert ((code - start) < 32);
 
+       mono_arch_flush_icache ((guint8*)start, (guint8*)code - (guint8*)start);
+
        inited = 1;
 
        return start;
@@ -146,6 +148,8 @@ mono_arch_get_call_filter (void)
 
        g_assert ((code - start) < 64);
 
+       mono_arch_flush_icache ((guint8*)start, (guint8*)code - (guint8*)start);
+
        inited = 1;
 
        return start;
@@ -197,6 +201,8 @@ get_throw_exception (gboolean rethrow)
 
        g_assert ((code - start) <= 16);
 
+       mono_arch_flush_icache ((guint8*)start, (guint8*)code - (guint8*)start);
+
        return start;
 }
 
@@ -287,6 +293,8 @@ mono_arch_get_throw_exception_by_name (void)
 
        g_assert ((code - start) < 32);
 
+       mono_arch_flush_icache ((guint8*)start, (guint8*)code - (guint8*)start);
+
        return start;
 }
 
@@ -344,6 +352,8 @@ mono_arch_get_throw_corlib_exception (void)
 
        g_assert ((code - start) < 32);
 
+       mono_arch_flush_icache ((guint8*)start, (guint8*)code - (guint8*)start);
+
        return start;
 }
 
@@ -358,8 +368,7 @@ 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;
        gpointer ip = MONO_CONTEXT_GET_IP (ctx);
@@ -369,7 +378,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;
@@ -392,8 +401,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
                new_ctx->sp = (gpointer*)(window [sparc_i6 - 16]);
                new_ctx->fp = (gpointer*)(MONO_SPARC_WINDOW_ADDR (new_ctx->sp) [sparc_i6 - 16]);
 
-               *res = *ji;
-               return res;
+               return ji;
        }
        else {
                if (!(*lmf))
@@ -404,10 +412,9 @@ 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)->ip))) {
-                       *res = *ji;
+               if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->ip, NULL))) {
                } else {
-                       memset (res, 0, sizeof (MonoJitInfo));
+                       memset (res, 0, MONO_SIZEOF_JIT_INFO);
                        res->method = (*lmf)->method;
                }
 
@@ -417,7 +424,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
 
                *lmf = (*lmf)->previous_lmf;
 
-               return res;
+               return ji ? ji : res;
        }
 }
 
@@ -427,6 +434,61 @@ mono_arch_has_unwind_info (gconstpointer addr)
        return FALSE;
 }
 
+#ifdef __linux__
+
+gboolean
+mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
+{
+       MonoContext mctx;
+       struct sigcontext *sc = sigctx;
+       gpointer *window;
+
+#ifdef SPARCV9
+       mctx.ip = (gpointer) sc->sigc_regs.tpc;
+       mctx.sp = (gpointer) sc->sigc_regs.u_regs[14];
+#else
+       mctx.ip = (gpointer) sc->si_regs.pc;
+       mctx.sp = (gpointer) sc->si_regs.u_regs[14];
+#endif
+
+       window = (gpointer*)(((guint8*)mctx.sp) + MONO_SPARC_STACK_BIAS);
+       mctx.fp = window [sparc_fp - 16];
+
+       mono_handle_exception (&mctx, obj, mctx.ip, test_only);
+
+#ifdef SPARCV9
+       sc->sigc_regs.tpc = (unsigned long) mctx.ip;
+       sc->sigc_regs.tnpc = (unsigned long) (mctx.ip + 4);
+       sc->sigc_regs.u_regs[14] = (unsigned long) mctx.sp;
+#else
+       sc->si_regs.pc = (unsigned long) mctx.ip;
+       sc->si_regs.npc = (unsigned long) (mctx.ip + 4);
+       sc->si_regs.u_regs[14] = (unsigned long) mctx.sp;
+#endif
+
+       window = (gpointer*)(((guint8*)mctx.sp) + MONO_SPARC_STACK_BIAS);
+       window [sparc_fp - 16] = mctx.fp;
+
+       return TRUE;
+}
+
+gpointer
+mono_arch_ip_from_context (void *sigctx)
+{
+       struct sigcontext *sc = sigctx;
+       gpointer *ret;
+
+#ifdef SPARCV9
+       ret = (gpointer) sc->sigc_regs.tpc;
+#else
+       ret = (gpointer) sc->si_regs.pc;
+#endif
+
+       return ret;
+}
+
+#else /* !__linux__ */
+
 gboolean
 mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
 {
@@ -439,12 +501,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
         * under documented under solaris. The code below seems to work under
         * Solaris 9.
         */
-#ifndef __linux__
        g_assert (!ctx->uc_mcontext.gwins);
-#else
-       /* better, but doesn't work all the time.  need to rethink! */
-       g_assert (!ctx->uc_mcontext.gregs);
-#endif
 
        mctx.ip = ctx->uc_mcontext.gregs [REG_PC];
        mctx.sp = ctx->uc_mcontext.gregs [REG_SP];
@@ -470,3 +527,4 @@ mono_arch_ip_from_context (void *sigctx)
        return (gpointer)ctx->uc_mcontext.gregs [REG_PC];
 }
 
+#endif