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 #2042 from evincarofautumn/remove-dead-code
[mono.git]
/
mono
/
mini
/
exceptions-sparc.c
diff --git
a/mono/mini/exceptions-sparc.c
b/mono/mini/exceptions-sparc.c
index 3ebe2e7a29c422b5bc72c2a65e1002cd8a1ad235..b3b5633597644d39ff345274d0fc4f2749b21d66 100644
(file)
--- a/
mono/mini/exceptions-sparc.c
+++ b/
mono/mini/exceptions-sparc.c
@@
-180,8
+180,10
@@
throw_exception (MonoObject *exc, gpointer sp, gpointer ip, gboolean rethrow)
if (mono_object_isinst (exc, mono_defaults.exception_class)) {
MonoException *mono_ex = (MonoException*)exc;
if (mono_object_isinst (exc, mono_defaults.exception_class)) {
MonoException *mono_ex = (MonoException*)exc;
- if (!rethrow)
+ if (!rethrow)
{
mono_ex->stack_trace = NULL;
mono_ex->stack_trace = NULL;
+ mono_ex->trace_ips = NULL;
+ }
}
mono_handle_exception (&ctx, exc);
restore_context (&ctx);
}
mono_handle_exception (&ctx, exc);
restore_context (&ctx);
@@
-324,7
+326,7
@@
mono_arch_get_throw_corlib_exception (MonoTrampInfo **info, gboolean aot)
return start;
}
return start;
}
-/* mono_arch_
find_jit_info
:
+/* mono_arch_
unwind_frame
:
*
* This function is used to gather information from @ctx. It return the
* MonoJitInfo of the corresponding function, unwinds one stack frame and
*
* This function is used to gather information from @ctx. It return the
* MonoJitInfo of the corresponding function, unwinds one stack frame and
@@
-334,7
+336,7
@@
mono_arch_get_throw_corlib_exception (MonoTrampInfo **info, gboolean aot)
* start of the function or -1 if that info is not available.
*/
gboolean
* start of the function or -1 if that info is not available.
*/
gboolean
-mono_arch_
find_jit_info
(MonoDomain *domain, MonoJitTlsData *jit_tls,
+mono_arch_
unwind_frame
(MonoDomain *domain, MonoJitTlsData *jit_tls,
MonoJitInfo *ji, MonoContext *ctx,
MonoContext *new_ctx, MonoLMF **lmf,
mgreg_t **save_locations,
MonoJitInfo *ji, MonoContext *ctx,
MonoContext *new_ctx, MonoLMF **lmf,
mgreg_t **save_locations,
@@
-348,7
+350,10
@@
mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
*new_ctx = *ctx;
if (ji != NULL) {
*new_ctx = *ctx;
if (ji != NULL) {
- frame->type = FRAME_TYPE_MANAGED;
+ if (ji->is_trampoline)
+ frame->type = FRAME_TYPE_TRAMPOLINE;
+ else
+ frame->type = FRAME_TYPE_MANAGED;
/* Restore ip and sp from the saved register window */
window = MONO_SPARC_WINDOW_ADDR (ctx->sp);
/* Restore ip and sp from the saved register window */
window = MONO_SPARC_WINDOW_ADDR (ctx->sp);