Transition sparc to use mono_arch_find_jit_info_ext.

diff --git a/mono/mini/exceptions-sparc.c b/mono/mini/exceptions-sparc.c
index a84bc1fb19f6572e4d60f6673635d3fef7214c69..c7198bfcaa8174484a95956ebc3cc62d37f7123f 100644 (file)
--- a/mono/mini/exceptions-sparc.c
+++ b/mono/mini/exceptions-sparc.c
@@ -333,29 +333,22 @@ mono_arch_get_throw_corlib_exception (MonoTrampInfo **info, gboolean aot)
  * the @lmf if necessary. @native_offset return the IP offset from the 
  * start of the function or -1 if that info is not available.
  */
-MonoJitInfo *
-mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *res, MonoJitInfo *prev_ji, MonoContext *ctx, 
-                        MonoContext *new_ctx, MonoLMF **lmf, gboolean *managed)
+gboolean
+mono_arch_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls, 
+                                                        MonoJitInfo *ji, MonoContext *ctx, 
+                                                        MonoContext *new_ctx, MonoLMF **lmf, 
+                                                        StackFrameInfo *frame)
 {
-       MonoJitInfo *ji;
-       gpointer ip = MONO_CONTEXT_GET_IP (ctx);
        gpointer *window;
 
-       /* Avoid costly table lookup during stack overflow */
-       if (prev_ji && (ip > prev_ji->code_start && ((guint8*)ip < ((guint8*)prev_ji->code_start) + prev_ji->code_size)))
-               ji = prev_ji;
-       else
-               ji = mini_jit_info_table_find (domain, ip, NULL);
+       memset (frame, 0, sizeof (StackFrameInfo));
+       frame->ji = ji;
+       frame->managed = FALSE;
 
-       if (managed)
-               *managed = FALSE;
+       *new_ctx = *ctx;
 
        if (ji != NULL) {
-               *new_ctx = *ctx;
-
-               if (managed)
-                       if (!ji->method->wrapper_type)
-                               *managed = TRUE;
+               frame->type = FRAME_TYPE_MANAGED;
 
                if (*lmf && (MONO_CONTEXT_GET_BP (ctx) >= (gpointer)(*lmf)->ebp)) {
                        /* remove any unused lmf */
@@ -368,22 +361,21 @@ 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]);
 
-               return ji;
+               return TRUE;
        }
        else {
                if (!(*lmf))
-                       return NULL;
-
-               *new_ctx = *ctx;
+                       return FALSE;
 
                if (!(*lmf)->method)
-                       return (gpointer)-1;
+                       return FALSE;
 
-               if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->ip, NULL))) {
-               } else {
-                       memset (res, 0, MONO_SIZEOF_JIT_INFO);
-                       res->method = (*lmf)->method;
-               }
+               ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->ip, NULL);
+               if (!ji)
+                       return FALSE;
+
+               frame->ji = ji;
+               frame->type = FRAME_TYPE_MANAGED_TO_NATIVE;
 
                new_ctx->ip = (*lmf)->ip;
                new_ctx->sp = (*lmf)->sp;
@@ -391,7 +383,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
 
                *lmf = (*lmf)->previous_lmf;
 
-               return ji ? ji : res;
+               return TRUE;
        }
 }
 

diff --git a/mono/mini/mini-sparc.h b/mono/mini/mini-sparc.h
index 8a42f3ec021336a0a61c4b9f0b2b3f6c7f835694..dac2f066ff1970c92feb78d024942ccccb50699b 100644 (file)
--- a/mono/mini/mini-sparc.h
+++ b/mono/mini/mini-sparc.h
@@ -122,6 +122,7 @@ typedef struct MonoCompileArch {
 #endif
 
 #define MONO_ARCH_THIS_AS_FIRST_ARG 1
+#define MONO_ARCH_HAVE_FIND_JIT_INFO_EXT 1
 
 #ifndef __GNUC__
 /* assume Sun compiler if not GCC */