projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #926 from ermshiperete/novell-bug-674098
[mono.git]
/
mono
/
mini
/
exceptions-s390x.c
diff --git
a/mono/mini/exceptions-s390x.c
b/mono/mini/exceptions-s390x.c
index b95c6ed30185eb0e26916800ce2cc4b14352b60c..38c4a5b987a41747ecbe637cb7c217b1372029c6 100644
(file)
--- a/
mono/mini/exceptions-s390x.c
+++ b/
mono/mini/exceptions-s390x.c
@@
-237,11
+237,7
@@
throw_exception (MonoObject *exc, unsigned long ip, unsigned long sp,
{
MonoContext ctx;
int iReg;
{
MonoContext ctx;
int iReg;
- static void (*restore_context) (MonoContext *);
- if (!restore_context)
- restore_context = mono_get_restore_context();
-
memset(&ctx, 0, sizeof(ctx));
setup_context(&ctx);
memset(&ctx, 0, sizeof(ctx));
setup_context(&ctx);
@@
-267,7
+263,7
@@
throw_exception (MonoObject *exc, unsigned long ip, unsigned long sp,
}
// mono_arch_handle_exception (&ctx, exc, FALSE);
mono_handle_exception (&ctx, exc);
}
// mono_arch_handle_exception (&ctx, exc, FALSE);
mono_handle_exception (&ctx, exc);
- restore_context(&ctx);
+
mono_
restore_context(&ctx);
g_assert_not_reached ();
}
g_assert_not_reached ();
}
@@
-476,10
+472,7
@@
mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
frame->type = FRAME_TYPE_MANAGED;
frame->type = FRAME_TYPE_MANAGED;
- if (ji->from_aot)
- unwind_info = mono_aot_get_unwind_info(ji, &unwind_info_len);
- else
- unwind_info = mono_get_cached_unwind_info(ji->used_regs, &unwind_info_len);
+ unwind_info = mono_jinfo_get_unwind_info (ji, &unwind_info_len);
if (*lmf && ((*lmf) != jit_tls->first_lmf) &&
(MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)) {
if (*lmf && ((*lmf) != jit_tls->first_lmf) &&
(MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)) {