X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-error.c;h=7cbce5cf765d3a0e8730327fa626bee8158ce54f;hb=0ebac113fce97894d0a53844f62c660a27cad7f7;hp=ca3350c5fd4b442074194c7afbd580aaae64f8a3;hpb=0658b3879aaa68b0b1124a56da4845c131fe10b4;p=mono.git diff --git a/mono/utils/mono-error.c b/mono/utils/mono-error.c index ca3350c5fd4..7cbce5cf765 100644 --- a/mono/utils/mono-error.c +++ b/mono/utils/mono-error.c @@ -4,6 +4,7 @@ * Authors: * Rodrigo Kumpera (rkumpera@novell.com) * Copyright 2009 Novell, Inc (http://www.novell.com) + * Licensed under the MIT license. See LICENSE file in the project root for full license information. */ #include @@ -11,19 +12,24 @@ #include "mono-error-internals.h" #include -#include #include -#include #include +#define set_error_messagev() do { \ + if (!(error->full_message = g_strdup_vprintf (msg_format, args))) \ + error->flags |= MONO_ERROR_INCOMPLETE; \ +} while (0) + #define set_error_message() do { \ va_list args; \ va_start (args, msg_format); \ - if (!(error->full_message = g_strdup_vprintf (msg_format, args))) \ - error->flags |= MONO_ERROR_INCOMPLETE; \ + set_error_messagev(); \ va_end (args); \ } while (0) +static void +mono_error_set_generic_errorv (MonoError *oerror, const char *name_space, const char *name, const char *msg_format, va_list args); + static gboolean is_managed_exception (MonoErrorInternal *error) { @@ -83,6 +89,13 @@ mono_error_init_flags (MonoError *oerror, unsigned short flags) error->flags = flags; } +/** + * mono_error_init: + * @error: Pointer to MonoError struct to initialize + * + * Any function which takes a MonoError for purposes of reporting an error + * is required to call either this or mono_error_init_flags on entry. + */ void mono_error_init (MonoError *error) { @@ -119,12 +132,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 @@ -332,129 +345,75 @@ mono_error_set_bad_image (MonoError *oerror, MonoImage *image, const char *msg_f } void -mono_error_set_generic_error (MonoError *oerror, const char * name_space, const char *name, const char *msg_format, ...) +mono_error_set_generic_errorv (MonoError *oerror, const char *name_space, const char *name, const char *msg_format, va_list args) { MonoErrorInternal *error = (MonoErrorInternal*)oerror; mono_error_prepare (error); error->error_code = MONO_ERROR_GENERIC; mono_error_set_corlib_exception (oerror, name_space, name); - set_error_message (); + set_error_messagev (); } void -mono_error_set_exception_instance (MonoError *oerror, MonoException *exc) +mono_error_set_generic_error (MonoError *oerror, const char * name_space, const char *name, const char *msg_format, ...) { - MonoErrorInternal *error = (MonoErrorInternal*)oerror; - - error->error_code = MONO_ERROR_EXCEPTION_INSTANCE; - error->exn.instance_handle = mono_gchandle_new (exc ? &exc->object : NULL, FALSE); + va_list args; + va_start (args, msg_format); + mono_error_set_generic_errorv (oerror, name_space, name, msg_format, args); + va_end (args); } +/** + * mono_error_set_not_implemented: + * + * System.NotImplementedException + */ void -mono_error_set_from_loader_error (MonoError *oerror) +mono_error_set_not_implemented (MonoError *oerror, const char *msg_format, ...) { - MonoLoaderError *loader_error = mono_loader_get_last_error (); - MonoErrorInternal *error = (MonoErrorInternal*)oerror; - gboolean dup_strings = TRUE; - - mono_error_prepare (error); - - if (!loader_error) { - mono_error_set_generic_error (oerror, "System", "ExecutionEngineException", "Runtime tried to produce a mono-error from an empty loader-error"); - return; - } - - switch (loader_error->exception_type) { - 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_INVALID_PROGRAM: - mono_error_set_generic_error (oerror, "System", "InvalidProgramException", "Failed for unknown reasons."); - break; - - case MONO_EXCEPTION_UNVERIFIABLE_IL: - mono_error_set_generic_error (oerror, "System.Security", "VerificationException", "Failed for unknown reasons."); - break; - - case MONO_EXCEPTION_MISSING_METHOD: - 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); - error->full_message = g_strdup ("Failed for unknown reasons."); - break; - - case MONO_EXCEPTION_MISSING_FIELD: - mono_error_set_field_load (oerror, loader_error->klass, loader_error->member_name, "Failed for unknown reasons."); - break; - - case MONO_EXCEPTION_TYPE_LOAD: - mono_error_set_type_load_name (oerror, g_strdup (loader_error->class_name), g_strdup (loader_error->assembly_name), "Failed for unknown reasons."); - dup_strings = FALSE; - break; - - case MONO_EXCEPTION_FILE_NOT_FOUND: - mono_error_set_assembly_load_simple (oerror, loader_error->assembly_name, loader_error->ref_only); - break; - - case MONO_EXCEPTION_METHOD_ACCESS: - mono_error_set_generic_error (oerror, "System", "MethodAccessException", "Failed for unknown reasons."); - break; - - case MONO_EXCEPTION_FIELD_ACCESS: - mono_error_set_generic_error (oerror, "System", "FieldAccessException", "Failed for unknown reasons."); - break; - - case MONO_EXCEPTION_OBJECT_SUPPLIED: - case MONO_EXCEPTION_GENERIC_SHARING_FAILED: - mono_error_set_generic_error (oerror, "System", "ExecutionEngineException", "Runtime tried to produce a mono-error from JIT internal error %d", loader_error->exception_type); - break; - - case MONO_EXCEPTION_BAD_IMAGE: - mono_error_set_bad_image_name (oerror, "", "%s", loader_error->msg); - break; - - case MONO_EXCEPTION_OUT_OF_MEMORY: - mono_error_set_out_of_memory (oerror, "Failed for unknown reasons."); - break; + va_list args; + va_start (args, msg_format); + mono_error_set_generic_errorv (oerror, "System", "NotImplementedException", msg_format, args); + va_end (args); +} - default: - mono_error_set_generic_error (oerror, "System", "ExecutionEngineException", "Runtime tried to produce an unknown loader-error %d", loader_error->exception_type); - break; - } +/** + * mono_error_set_execution_engine: + * + * System.ExecutionEngineException + */ +void +mono_error_set_execution_engine (MonoError *oerror, const char *msg_format, ...) +{ + va_list args; + va_start (args, msg_format); + mono_error_set_generic_errorv (oerror, "System", "ExecutionEngineException", msg_format, args); + va_end (args); +} - mono_error_dup_strings (oerror, dup_strings); - mono_loader_clear_error (); +/** + * mono_error_set_execution_engine: + * + * System.NotSupportedException + */ +void +mono_error_set_not_supported (MonoError *oerror, const char *msg_format, ...) +{ + va_list args; + va_start (args, msg_format); + mono_error_set_generic_errorv (oerror, "System", "NotSupportedException", msg_format, args); + va_end (args); } void -mono_loader_set_error_from_mono_error (MonoError *oerror) +mono_error_set_exception_instance (MonoError *oerror, MonoException *exc) { MonoErrorInternal *error = (MonoErrorInternal*)oerror; - switch (error->error_code) { - case MONO_ERROR_MISSING_METHOD: - 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->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)); - break; - case MONO_ERROR_FILE_NOT_FOUND: - /* XXX can't recover if it's ref only or not */ - 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 (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", error->full_message)); - } + mono_error_prepare (error); + error->error_code = MONO_ERROR_EXCEPTION_INSTANCE; + error->exn.instance_handle = mono_gchandle_new (exc ? &exc->object : NULL, FALSE); } void @@ -480,6 +439,18 @@ mono_error_set_argument (MonoError *oerror, const char *argument, const char *ms set_error_message (); } +void +mono_error_set_argument_null (MonoError *oerror, const char *argument, const char *msg_format, ...) +{ + MonoErrorInternal *error = (MonoErrorInternal*)oerror; + mono_error_prepare (error); + + error->error_code = MONO_ERROR_ARGUMENT_NULL; + error->first_argument = argument; + + set_error_message (); +} + void mono_error_set_not_verifiable (MonoError *oerror, MonoMethod *method, const char *msg_format, ...) { @@ -586,7 +557,7 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) break; case MONO_ERROR_TYPE_LOAD: - if (error->type_name || error->assembly_name) { + if ((error->type_name && error->assembly_name) || error->exn.klass) { type_name = get_type_name_as_mono_string (error, domain, error_out); if (!mono_error_ok (error_out)) break; @@ -644,6 +615,10 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) exception = mono_get_exception_argument (error->first_argument, error->full_message); break; + case MONO_ERROR_ARGUMENT_NULL: + exception = mono_get_exception_argument_null (error->first_argument); + break; + case MONO_ERROR_NOT_VERIFIABLE: { char *type_name = NULL, *message; if (error->exn.klass) { @@ -666,7 +641,7 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) } case MONO_ERROR_GENERIC: 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"); + mono_error_set_execution_engine (error_out, "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, error->full_message); break; @@ -676,7 +651,7 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out) break; default: - mono_error_set_generic_error (error_out, "System", "ExecutionEngineException", "Invalid error-code %d", error->error_code); + mono_error_set_execution_engine (error_out, "Invalid error-code %d", error->error_code); } if (!mono_error_ok (error_out)) @@ -712,3 +687,10 @@ mono_error_convert_to_exception (MonoError *target_error) mono_error_cleanup (target_error); return ex; } + +void +mono_error_move (MonoError *dest, MonoError *src) +{ + memcpy (dest, src, sizeof (MonoErrorInternal)); + mono_error_init (src); +}