projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add fields in generic instances too when AOTing. Fixes #5316.
[mono.git]
/
mono
/
mini
/
exceptions-sparc.c
diff --git
a/mono/mini/exceptions-sparc.c
b/mono/mini/exceptions-sparc.c
index c7198bfcaa8174484a95956ebc3cc62d37f7123f..20d2f0facefe90102e81875de578903664e8c138 100644
(file)
--- a/
mono/mini/exceptions-sparc.c
+++ b/
mono/mini/exceptions-sparc.c
@@
-183,7
+183,7
@@
throw_exception (MonoObject *exc, gpointer sp, gpointer ip, gboolean rethrow)
if (!rethrow)
mono_ex->stack_trace = NULL;
}
if (!rethrow)
mono_ex->stack_trace = NULL;
}
- mono_handle_exception (&ctx, exc
, ip, FALSE
);
+ mono_handle_exception (&ctx, exc);
restore_context (&ctx);
g_assert_not_reached ();
restore_context (&ctx);
g_assert_not_reached ();
@@
-334,16
+334,16
@@
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
_ext
(MonoDomain *domain, MonoJitTlsData *jit_tls,
+mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
MonoJitInfo *ji, MonoContext *ctx,
MonoJitInfo *ji, MonoContext *ctx,
- MonoContext *new_ctx, MonoLMF **lmf,
+ MonoContext *new_ctx, MonoLMF **lmf,
+ mgreg_t **save_locations,
StackFrameInfo *frame)
{
gpointer *window;
memset (frame, 0, sizeof (StackFrameInfo));
frame->ji = ji;
StackFrameInfo *frame)
{
gpointer *window;
memset (frame, 0, sizeof (StackFrameInfo));
frame->ji = ji;
- frame->managed = FALSE;
*new_ctx = *ctx;
*new_ctx = *ctx;
@@
-387,16
+387,10
@@
mono_arch_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
}
}
}
}
-gboolean
-mono_arch_has_unwind_info (gconstpointer addr)
-{
- return FALSE;
-}
-
#ifdef __linux__
gboolean
#ifdef __linux__
gboolean
-mono_arch_handle_exception (void *sigctx, gpointer obj
, gboolean test_only
)
+mono_arch_handle_exception (void *sigctx, gpointer obj)
{
MonoContext mctx;
struct sigcontext *sc = sigctx;
{
MonoContext mctx;
struct sigcontext *sc = sigctx;
@@
-413,7
+407,7
@@
mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
window = (gpointer*)(((guint8*)mctx.sp) + MONO_SPARC_STACK_BIAS);
mctx.fp = window [sparc_fp - 16];
window = (gpointer*)(((guint8*)mctx.sp) + MONO_SPARC_STACK_BIAS);
mctx.fp = window [sparc_fp - 16];
- mono_handle_exception (&mctx, obj
, mctx.ip, test_only
);
+ mono_handle_exception (&mctx, obj);
#ifdef SPARCV9
sc->sigc_regs.tpc = (unsigned long) mctx.ip;
#ifdef SPARCV9
sc->sigc_regs.tpc = (unsigned long) mctx.ip;
@@
-449,7
+443,7
@@
mono_arch_ip_from_context (void *sigctx)
#else /* !__linux__ */
gboolean
#else /* !__linux__ */
gboolean
-mono_arch_handle_exception (void *sigctx, gpointer obj
, gboolean test_only
)
+mono_arch_handle_exception (void *sigctx, gpointer obj)
{
MonoContext mctx;
ucontext_t *ctx = (ucontext_t*)sigctx;
{
MonoContext mctx;
ucontext_t *ctx = (ucontext_t*)sigctx;
@@
-467,7
+461,7
@@
mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
window = (gpointer*)(((guint8*)mctx.sp) + MONO_SPARC_STACK_BIAS);
mctx.fp = window [sparc_fp - 16];
window = (gpointer*)(((guint8*)mctx.sp) + MONO_SPARC_STACK_BIAS);
mctx.fp = window [sparc_fp - 16];
- mono_handle_exception (&mctx, obj
, mctx.ip, test_only
);
+ mono_handle_exception (&mctx, obj);
/* We can't use restore_context to return from a signal handler */
ctx->uc_mcontext.gregs [REG_PC] = mctx.ip;
/* We can't use restore_context to return from a signal handler */
ctx->uc_mcontext.gregs [REG_PC] = mctx.ip;