projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the DISABLE_JIT build.
[mono.git]
/
mono
/
mini
/
exceptions-alpha.c
diff --git
a/mono/mini/exceptions-alpha.c
b/mono/mini/exceptions-alpha.c
index c51ed87488c6ae70e061eea64070827fec310f15..f507f7572104529059e83bf6695768e14bbc1b5e 100644
(file)
--- a/
mono/mini/exceptions-alpha.c
+++ b/
mono/mini/exceptions-alpha.c
@@
-19,9
+19,6
@@
/*------------------------------------------------------------------*/
/* D e f i n e s */
/*------------------------------------------------------------------*/
/*------------------------------------------------------------------*/
/* D e f i n e s */
/*------------------------------------------------------------------*/
-#define NOT_IMPLEMENTED(x) \
- g_error ("FIXME: %s is not yet implemented.", x);
-
#define ALPHA_DEBUG(x) \
if (mini_alpha_verbose_level) \
g_debug ("ALPHA_DEBUG: %s is called.", x);
#define ALPHA_DEBUG(x) \
if (mini_alpha_verbose_level) \
g_debug ("ALPHA_DEBUG: %s is called.", x);
@@
-274,7
+271,7
@@
static void throw_exception(MonoException *exc, unsigned long RA,
mono_ex->stack_trace = NULL;
}
mono_ex->stack_trace = NULL;
}
- mono_handle_exception (&ctx, exc
, (gpointer)RA, FALSE
);
+ mono_handle_exception (&ctx, exc);
restore_context(&ctx);
restore_context(&ctx);
@@
-568,18
+565,15
@@
mono_arch_get_throw_corlib_exception (void)
/* */
/* Parameters - ctx - Saved processor state */
/* obj - The exception object */
/* */
/* Parameters - ctx - Saved processor state */
/* obj - The exception object */
-/* test_only - Only test if the exception is caught, */
-/* but don't call handlers */
/* */
/*------------------------------------------------------------------*/
gboolean
/* */
/*------------------------------------------------------------------*/
gboolean
-mono_arch_handle_exception (void *uc, gpointer obj
, gboolean test_only
)
+mono_arch_handle_exception (void *uc, gpointer obj)
{
ALPHA_DEBUG("mono_arch_handle_exception");
{
ALPHA_DEBUG("mono_arch_handle_exception");
- return mono_handle_exception (uc, obj, mono_arch_ip_from_context(uc),
- test_only);
+ return mono_handle_exception (uc, obj);
}
/*========================= End of Function ========================*/
}
/*========================= End of Function ========================*/
@@
-783,9
+777,10
@@
mono_arch_get_throw_exception_by_name (void)
MonoJitInfo *
mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
MonoJitInfo *res, MonoJitInfo *prev_ji,
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 *ctx,
+ MonoContext *new_ctx, MonoLMF **lmf,
+ mgreg_t **save_locations,
+ gboolean *managed)
{
MonoJitInfo *ji;
int i;
{
MonoJitInfo *ji;
int i;
@@
-799,7
+794,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
((guint8*)ip < ((guint8*)prev_ji->code_start) + prev_ji->code_size)))
ji = prev_ji;
else
-
ji = mono_jit_info_table_find (domain, ip
);
+
ji = mini_jit_info_table_find (domain, ip, NULL
);
if (managed)
*managed = FALSE;
if (managed)
*managed = FALSE;
@@
-978,9
+973,9
@@
mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
if (!(*lmf)->method)
return (gpointer)-1;
if (!(*lmf)->method)
return (gpointer)-1;
- if ((ji = m
ono_jit_info_table_find (domain, (gpointer)(*lmf)->eip
))) {
+ if ((ji = m
ini_jit_info_table_find (domain, (gpointer)(*lmf)->eip, NULL
))) {
} else {
} else {
- memset (res, 0,
sizeof (MonoJitInfo)
);
+ memset (res, 0,
MONO_SIZEOF_JIT_INFO
);
res->method = (*lmf)->method;
}
res->method = (*lmf)->method;
}