MonoException *
mono_exception_from_token (MonoImage *image, guint32 token)
{
+ MonoError error;
MonoClass *klass;
MonoObject *o;
- klass = mono_class_get (image, token);
+ klass = mono_class_get_checked (image, token, &error);
+ g_assert (mono_error_ok (&error)); /* FIXME handle the error. */
o = mono_object_new (mono_domain_get (), klass);
g_assert (o != NULL);
mono_exception_from_token_two_strings (MonoImage *image, guint32 token,
MonoString *a1, MonoString *a2)
{
- MonoClass *klass = mono_class_get (image, token);
+ MonoError error;
+ MonoClass *klass = mono_class_get_checked (image, token, &error);
+ g_assert (mono_error_ok (&error)); /* FIXME handle the error. */
return create_exception_two_strings (klass, a1, a2);
}
mono_exception_from_name (mono_get_corlib (), "System.Runtime.CompilerServices",
"RuntimeWrappedException");
- MONO_OBJECT_SETREF (ex, wrapped_exception, wrapped_exception);
+ MONO_OBJECT_SETREF (ex, m_wrappedException, wrapped_exception);
return (MonoException*)ex;
}
+static gboolean
+append_frame_and_continue (MonoMethod *method, gpointer ip, size_t native_offset, gboolean managed, gpointer user_data)
+{
+ MonoDomain *domain = mono_domain_get ();
+ GString *text = (GString*)user_data;
+
+ if (method) {
+ char *msg = mono_debug_print_stack_frame (method, native_offset, domain);
+ g_string_append_printf (text, "%s\n", msg);
+ g_free (msg);
+ } else {
+ g_string_append_printf (text, "<unknown native frame 0x%x>\n", ip);
+ }
+
+ return FALSE;
+}
+
+char *
+mono_exception_get_managed_backtrace (MonoException *exc)
+{
+ GString *text;
+
+ text = g_string_new_len (NULL, 20);
+
+ if (!mono_get_eh_callbacks ()->mono_exception_walk_trace (exc, append_frame_and_continue, text))
+ g_string_append (text, "managed backtrace not available\n");
+
+ return g_string_free (text, FALSE);
+}
+
char *
mono_exception_get_native_backtrace (MonoException *exc)
{
gpointer ip = mono_array_get (arr, gpointer, i);
MonoJitInfo *ji = mono_jit_info_table_find (mono_domain_get (), ip);
if (ji) {
- char *msg = mono_debug_print_stack_frame (ji->method, (char*)ip - (char*)ji->code_start, domain);
+ char *msg = mono_debug_print_stack_frame (mono_jit_info_get_method (ji), (char*)ip - (char*)ji->code_start, domain);
g_string_append_printf (text, "%s\n", msg);
g_free (msg);
} else {