X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Futils%2Fmono-error.c;h=5673719059b0f182f4472aa37a4769d79dff2851;hb=8a23cf5c1e29d8f5dc36607092c2688a98f6d4dc;hp=e519220dc4c2d41f662d4ccaa97384a7d11a3bc6;hpb=1dec57e9ee8fa09a657f1b687944f17f468f90e5;p=mono.git diff --git a/mono/utils/mono-error.c b/mono/utils/mono-error.c index e519220dc4c..5673719059b 100644 --- a/mono/utils/mono-error.c +++ b/mono/utils/mono-error.c @@ -13,30 +13,42 @@ #include #include #include - -#define mono_internal_error_get_message(E) ((E)->full_message ? (E)->full_message : (E)->message) +#include +#include #define set_error_message() do { \ va_list args; \ va_start (args, msg_format); \ - if (g_vsnprintf (error->message, sizeof (error->message), msg_format, args) >= sizeof (error->message)) {\ - va_end (args); \ - va_start (args, msg_format); \ - if (!(error->full_message = g_strdup_vprintf (msg_format, args))) \ + if (!(error->full_message = g_strdup_vprintf (msg_format, args))) \ error->flags |= MONO_ERROR_INCOMPLETE; \ - } \ va_end (args); \ } while (0) +static gboolean +is_managed_exception (MonoErrorInternal *error) +{ + return (error->error_code == MONO_ERROR_EXCEPTION_INSTANCE); +} + static void mono_error_prepare (MonoErrorInternal *error) { if (error->error_code != MONO_ERROR_NONE) return; - error->type_name = error->assembly_name = error->member_name = error->full_message = error->exception_name_space = error->exception_name = error->full_message_with_fields = NULL; - error->klass = NULL; - error->message [0] = 0; + error->type_name = error->assembly_name = error->member_name = error->full_message = error->exception_name_space = error->exception_name = error->full_message_with_fields = error->first_argument = NULL; + error->exn.klass = NULL; +} + +static MonoClass* +get_class (MonoErrorInternal *error) +{ + MonoClass *klass = NULL; + if (is_managed_exception (error)) + klass = mono_object_class (mono_gchandle_get_target (error->exn.instance_handle)); + else + klass = error->exn.klass; + return klass; } static const char* @@ -44,8 +56,9 @@ get_type_name (MonoErrorInternal *error) { if (error->type_name) return error->type_name; - if (error->klass) - return error->klass->name; + MonoClass *klass = get_class (error); + if (klass) + return klass->name; return ""; } @@ -54,8 +67,9 @@ get_assembly_name (MonoErrorInternal *error) { if (error->assembly_name) return error->assembly_name; - if (error->klass && error->klass->image) - return error->klass->image->name; + MonoClass *klass = get_class (error); + if (klass && klass->image) + return klass->image->name; return ""; } @@ -82,6 +96,9 @@ mono_error_cleanup (MonoError *oerror) if (error->error_code == MONO_ERROR_NONE) return; + if (is_managed_exception (error)) + mono_gchandle_free (error->exn.instance_handle); + g_free ((char*)error->full_message); g_free ((char*)error->full_message_with_fields); if (!(error->flags & MONO_ERROR_FREE_STRINGS)) //no memory was allocated @@ -92,6 +109,7 @@ mono_error_cleanup (MonoError *oerror) g_free ((char*)error->member_name); g_free ((char*)error->exception_name_space); g_free ((char*)error->exception_name); + g_free ((char*)error->first_argument); } gboolean @@ -101,12 +119,12 @@ mono_error_ok (MonoError *error) } void -mono_error_assert_ok (MonoError *error) +mono_error_assert_ok_pos (MonoError *error, const char* filename, int lineno) { if (mono_error_ok (error)) return; - g_error ("%s\n", mono_error_get_message (error)); + g_error ("%s:%d: %s\n", filename, lineno, mono_error_get_message (error)); } unsigned short @@ -127,12 +145,12 @@ mono_error_get_message (MonoError *oerror) return error->full_message_with_fields; error->full_message_with_fields = g_strdup_printf ("%s assembly:%s type:%s member:%s", - mono_internal_error_get_message (error), + error->full_message, get_assembly_name (error), get_type_name (error), error->member_name ? error->member_name : ""); - return error->full_message_with_fields ? error->full_message_with_fields : mono_internal_error_get_message (error); + return error->full_message_with_fields ? error->full_message_with_fields : error->full_message; } /* @@ -157,6 +175,7 @@ mono_error_dup_strings (MonoError *oerror, gboolean dup_strings) DUP_STR (member_name); DUP_STR (exception_name_space); DUP_STR (exception_name); + DUP_STR (first_argument); } #undef DUP_STR } @@ -201,7 +220,9 @@ mono_error_set_class (MonoError *oerror, MonoClass *klass) { MonoErrorInternal *error = (MonoErrorInternal*)oerror; - error->klass = klass; + if (is_managed_exception (error)) + return; + error->exn.klass = klass; } static void @@ -321,6 +342,16 @@ mono_error_set_generic_error (MonoError *oerror, const char * name_space, const set_error_message (); } +void +mono_error_set_exception_instance (MonoError *oerror, MonoException *exc) +{ + MonoErrorInternal *error = (MonoErrorInternal*)oerror; + + mono_error_prepare (error); + error->error_code = MONO_ERROR_EXCEPTION_INSTANCE; + error->exn.instance_handle = mono_gchandle_new (exc ? &exc->object : NULL, FALSE); +} + void mono_error_set_from_loader_error (MonoError *oerror) { @@ -339,10 +370,6 @@ mono_error_set_from_loader_error (MonoError *oerror) case MONO_EXCEPTION_NONE: mono_error_set_generic_error (oerror, "System", "ExecutionEngineException", "Runtime tried to produce a mono-error from a non-error loader-error"); break; - case MONO_EXCEPTION_SECURITY_LINKDEMAND: - case MONO_EXCEPTION_SECURITY_INHERITANCEDEMAND: - mono_error_set_generic_error (oerror, "System.Security", "SecurityException", "Failed for unknown reasons."); - break; case MONO_EXCEPTION_INVALID_PROGRAM: mono_error_set_generic_error (oerror, "System", "InvalidProgramException", "Failed for unknown reasons."); @@ -356,7 +383,7 @@ mono_error_set_from_loader_error (MonoError *oerror) error->error_code = MONO_ERROR_MISSING_METHOD; mono_error_set_type_name (oerror, loader_error->class_name); mono_error_set_member_name (oerror, loader_error->member_name); - g_snprintf (error->message, sizeof (error->message), "Failed for unknown reasons."); + error->full_message = g_strdup ("Failed for unknown reasons."); break; case MONO_EXCEPTION_MISSING_FIELD: @@ -412,7 +439,7 @@ mono_loader_set_error_from_mono_error (MonoError *oerror) mono_loader_set_error_method_load (get_type_name (error), error->member_name); break; case MONO_ERROR_MISSING_FIELD: - mono_loader_set_error_field_load (error->klass, error->member_name); + mono_loader_set_error_field_load (error->exn.klass, error->member_name); break; case MONO_ERROR_TYPE_LOAD: mono_loader_set_error_type_load (get_type_name (error), get_assembly_name (error)); @@ -422,10 +449,12 @@ mono_loader_set_error_from_mono_error (MonoError *oerror) mono_loader_set_error_assembly_load (get_assembly_name (error), FALSE); break; case MONO_ERROR_BAD_IMAGE: - mono_loader_set_error_bad_image (g_strdup (mono_internal_error_get_message (error))); + mono_loader_set_error_bad_image (g_strdup (error->full_message)); break; + case MONO_ERROR_EXCEPTION_INSTANCE: + mono_loader_set_error_bad_image (g_strdup_printf ("Non translatable error")); default: - mono_loader_set_error_bad_image (g_strdup_printf ("Non translatable error: %s", mono_internal_error_get_message (error))); + mono_loader_set_error_bad_image (g_strdup_printf ("Non translatable error: %s", error->full_message)); } } @@ -433,13 +462,11 @@ void mono_error_set_out_of_memory (MonoError *oerror, const char *msg_format, ...) { MonoErrorInternal *error = (MonoErrorInternal*)oerror; - va_list args; mono_error_prepare (error); error->error_code = MONO_ERROR_OUT_OF_MEMORY; - va_start (args, msg_format); - g_vsnprintf (error->message, sizeof (error->message), msg_format, args); - va_end (args); + + set_error_message (); } void @@ -449,7 +476,7 @@ mono_error_set_argument (MonoError *oerror, const char *argument, const char *ms mono_error_prepare (error); error->error_code = MONO_ERROR_ARGUMENT; - error->type_name = argument; /*use the first available string slot*/ + error->first_argument = argument; set_error_message (); } @@ -478,11 +505,14 @@ get_type_name_as_mono_string (MonoErrorInternal *error, MonoDomain *domain, Mono if (error->type_name) { res = mono_string_new (domain, error->type_name); - } else if (error->klass) { - char *name = mono_type_full_name (&error->klass->byval_arg); - if (name) { - res = mono_string_new (domain, name); - g_free (name); + } else { + MonoClass *klass = get_class (error); + if (klass) { + char *name = mono_type_full_name (&klass->byval_arg); + if (name) { + res = mono_string_new (domain, name); + g_free (name); + } } } if (!res) @@ -493,7 +523,7 @@ get_type_name_as_mono_string (MonoErrorInternal *error, MonoDomain *domain, Mono static void set_message_on_exception (MonoException *exception, MonoErrorInternal *error, MonoError *error_out) { - MonoString *msg = mono_string_new (mono_domain_get (), mono_internal_error_get_message (error)); + MonoString *msg = mono_string_new (mono_domain_get (), error->full_message); if (msg) MONO_OBJECT_SETREF (exception, message, msg); else @@ -517,7 +547,7 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) return NULL; case MONO_ERROR_MISSING_METHOD: - if ((error->type_name || error->klass) && error->member_name) { + if ((error->type_name || error->exn.klass) && error->member_name) { type_name = get_type_name_as_mono_string (error, domain, error_out); if (!mono_error_ok (error_out)) break; @@ -532,12 +562,12 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) if (exception) set_message_on_exception (exception, error, error_out); } else { - exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingMethodException", mono_internal_error_get_message (error)); + exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingMethodException", error->full_message); } break; case MONO_ERROR_MISSING_FIELD: - if ((error->type_name || error->klass) && error->member_name) { + if ((error->type_name || error->exn.klass) && error->member_name) { type_name = get_type_name_as_mono_string (error, domain, error_out); if (!mono_error_ok (error_out)) break; @@ -552,7 +582,7 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) if (exception) set_message_on_exception (exception, error, error_out); } else { - exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingFieldException", mono_internal_error_get_message (error)); + exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingFieldException", error->full_message); } break; @@ -574,14 +604,14 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) if (exception) set_message_on_exception (exception, error, error_out); } else { - exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "TypeLoadException", mono_internal_error_get_message (error)); + exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "TypeLoadException", error->full_message); } break; case MONO_ERROR_FILE_NOT_FOUND: case MONO_ERROR_BAD_IMAGE: if (error->assembly_name) { - msg = mono_string_new (domain, mono_internal_error_get_message (error)); + msg = mono_string_new (domain, error->full_message); if (!msg) { mono_error_set_out_of_memory (error_out, "Could not allocate message"); break; @@ -601,9 +631,9 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) exception = mono_exception_from_name_two_strings (mono_defaults.corlib, "System", "BadImageFormatException", msg, assembly_name); } else { if (error->error_code == MONO_ERROR_FILE_NOT_FOUND) - exception = mono_exception_from_name_msg (mono_get_corlib (), "System.IO", "FileNotFoundException", mono_internal_error_get_message (error)); + exception = mono_exception_from_name_msg (mono_get_corlib (), "System.IO", "FileNotFoundException", error->full_message); else - exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "BadImageFormatException", mono_internal_error_get_message (error)); + exception = mono_exception_from_name_msg (mono_defaults.corlib, "System", "BadImageFormatException", error->full_message); } break; @@ -612,19 +642,19 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) break; case MONO_ERROR_ARGUMENT: - exception = mono_get_exception_argument (error->type_name, mono_internal_error_get_message (error)); + exception = mono_get_exception_argument (error->first_argument, error->full_message); break; case MONO_ERROR_NOT_VERIFIABLE: { char *type_name = NULL, *message; - if (error->klass) { - type_name = mono_type_get_full_name (error->klass); + if (error->exn.klass) { + type_name = mono_type_get_full_name (error->exn.klass); if (!type_name) { mono_error_set_out_of_memory (error_out, "Could not allocate message"); break; } } - message = g_strdup_printf ("Error in %s:%s %s", type_name, error->member_name, mono_internal_error_get_message (error)); + message = g_strdup_printf ("Error in %s:%s %s", type_name, error->member_name, error->full_message); if (!message) { g_free (type_name); mono_error_set_out_of_memory (error_out, "Could not allocate message"); @@ -639,7 +669,11 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) if (!error->exception_name_space || !error->exception_name) mono_error_set_generic_error (error_out, "System", "ExecutionEngineException", "MonoError with generic error but no exception name was supplied"); else - exception = mono_exception_from_name_msg (mono_defaults.corlib, error->exception_name_space, error->exception_name, mono_internal_error_get_message (error)); + exception = mono_exception_from_name_msg (mono_defaults.corlib, error->exception_name_space, error->exception_name, error->full_message); + break; + + case MONO_ERROR_EXCEPTION_INSTANCE: + exception = (MonoException*) mono_gchandle_get_target (error->exn.instance_handle); break; default: