X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fexceptions-s390.c;h=2e41bb787e4c6f3456e75e066aa1fb46c0b243ca;hb=102197b11d6ce990d2bdc2325ed944a05e780e40;hp=1aad39a1b33a70247bf2eb456682d3e336cc4cb0;hpb=75df74a96c33af7a99e16e4281272f1b67334a48;p=mono.git diff --git a/mono/mini/exceptions-s390.c b/mono/mini/exceptions-s390.c index 1aad39a1b33..2e41bb787e4 100644 --- a/mono/mini/exceptions-s390.c +++ b/mono/mini/exceptions-s390.c @@ -436,8 +436,7 @@ mono_arch_get_throw_exception_by_name (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); @@ -448,13 +447,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, ((guint8 *) ip <= ((guint8 *) prev_ji->code_start) + prev_ji->code_size))) ji = prev_ji; else - ji = mono_jit_info_table_find (domain, ip); - - if (trace) - *trace = NULL; - - if (native_offset) - *native_offset = -1; + ji = mini_jit_info_table_find (domain, ip, NULL); if (managed) *managed = FALSE; @@ -471,9 +464,6 @@ 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; @@ -491,9 +481,9 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, 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, sizeof (MonoJitInfo)); + memset (res, 0, MONO_SIZEOF_JIT_INFO); res->method = (*lmf)->method; }