2009-02-03 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/exceptions-s390x.c b/mono/mini/exceptions-s390x.c
index b5a8ca34672ceb13a5857768545e24923af4336f..4699b36803baf663c3a3d31816f76a68e8e443a7 100644 (file)
--- a/mono/mini/exceptions-s390x.c
+++ b/mono/mini/exceptions-s390x.c
@@ -426,7 +426,7 @@ mono_arch_get_throw_exception_by_name (void)
 /*                                                                  */
 /* Name                - mono_arch_find_jit_info                           */
 /*                                                                  */
-/* Function    - This function is used to gather informatoin from  */
+/* Function    - This function is used to gather information from  */
 /*                @ctx. It returns the MonoJitInfo of the corres-   */
 /*                ponding function, unwinds one stack frame and     */
 /*                stores the resulting context into @new_ctx. It    */
@@ -434,15 +434,14 @@ mono_arch_get_throw_exception_by_name (void)
 /*                into @trace (if not NULL), and modifies the @lmf  */
 /*                if necessary. @native_offset returns the IP off-  */
 /*                set from the start of the function or -1 if that  */
-/*                informatoin is not available.                     */
+/*                information is not available.                     */
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
 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 = (gpointer) MONO_CONTEXT_GET_IP (ctx);
@@ -455,18 +454,11 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
        else
                ji = mono_jit_info_table_find (domain, ip);
 
-       if (trace)
-               *trace = NULL;
-
-       if (native_offset)
-               *native_offset = -1;
-
        if (managed)
                *managed = FALSE;
 
        if (ji != NULL) {
-               char *source_location, *tmpaddr, *fname;
-               gint64 address, iloffset;
+               gint64 address;
 
                *new_ctx = *ctx;
 
@@ -477,39 +469,17 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                address = (char *)ip - (char *)ji->code_start;
 
-               if (native_offset)
-                       *native_offset = address;
-
                if (managed)
                        if (!ji->method->wrapper_type)
                                *managed = TRUE;
 
-               if (trace) {
-                       source_location = mono_debug_source_location_from_address (ji->method, address, NULL, domain);
-                       iloffset = mono_debug_il_offset_from_address (ji->method, address, domain);
-
-                       if (iloffset < 0)
-                               tmpaddr = g_strdup_printf ("<0x%016lx>", address);
-                       else
-                               tmpaddr = g_strdup_printf ("[0x%16x]", iloffset);
-               
-                       fname = mono_method_full_name (ji->method, TRUE);
-
-                       if (source_location)
-                               *trace = g_strdup_printf ("in %s (at %s) %s", tmpaddr, source_location, fname);
-                       else
-                               *trace = g_strdup_printf ("in %s %s", tmpaddr, fname);
-
-                       g_free (fname);
-                       g_free (source_location);
-                       g_free (tmpaddr);
-               }
                sframe = (MonoS390StackFrame *) MONO_CONTEXT_GET_SP (ctx);
                MONO_CONTEXT_SET_BP (new_ctx, sframe->prev);
                sframe = (MonoS390StackFrame *) sframe->prev;
                MONO_CONTEXT_SET_IP (new_ctx, sframe->return_address);
                memcpy (&new_ctx->uc_mcontext.gregs[6], sframe->regs, (8*sizeof(gint64)));
                return ji;
+
        } else if (*lmf) {
                
                *new_ctx = *ctx;
@@ -517,9 +487,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
                if (!(*lmf)->method)
                        return (gpointer)-1;
 
-               if (trace)
-                       *trace = g_strdup_printf ("in (unmanaged) %s", mono_method_full_name ((*lmf)->method, TRUE));
-               
                if ((ji = mono_jit_info_table_find (domain, (gpointer)(*lmf)->eip))) {
                } else {
                        memset (res, 0, sizeof (MonoJitInfo));