Merge pull request #2819 from BrzVlad/fix-major-log

[mono.git] / mono / utils / mono-error-internals.h

diff --git a/mono/utils/mono-error-internals.h b/mono/utils/mono-error-internals.h
index 774203d343c852455a64f8f9c425684ba2f89bda..71498c0d99b4e2e8148f5c73658aba7b934c2f0a 100644 (file)
--- a/mono/utils/mono-error-internals.h
+++ b/mono/utils/mono-error-internals.h
@@ -2,7 +2,7 @@
 #define __MONO_ERROR_INTERNALS_H__
 
 #include "mono/utils/mono-compiler.h"
-#include "mono/metadata/object-internals.h"
+#include "mono/metadata/class-internals.h"
 
 /*Keep in sync with MonoError*/
 typedef struct {
@@ -15,7 +15,16 @@ typedef struct {
        const char *member_name;
        const char *exception_name_space;
        const char *exception_name;
-       MonoClass *klass;
+       union {
+               /* Valid if error_code != MONO_ERROR_EXCEPTION_INSTANCE.
+                * Used by type or field load errors and generic error specified by class.
+                */
+               MonoClass *klass;
+               /* Valid if error_code == MONO_ERROR_EXCEPTION_INSTANCE.
+                * Generic error specified by a managed instance.
+                */
+               uint32_t instance_handle;
+       } exn;
        const char *full_message;
        const char *full_message_with_fields;
        const char *first_argument;
@@ -30,8 +39,13 @@ typedef struct {
 
 #define is_ok(error) ((error)->error_code == MONO_ERROR_NONE)
 
+#define return_if_nok(error) do { if (!is_ok ((error))) return; } while (0)
+#define return_val_if_nok(error,val) do { if (!is_ok ((error))) return (val); } while (0)
+
 void
-mono_error_assert_ok (MonoError *error);
+mono_error_assert_ok_pos (MonoError *error, const char* filename, int lineno) MONO_LLVM_INTERNAL;
+
+#define mono_error_assert_ok(e) mono_error_assert_ok_pos (e, __FILE__, __LINE__);
 
 void
 mono_error_dup_strings (MonoError *error, gboolean dup_strings);
@@ -70,6 +84,9 @@ mono_error_set_out_of_memory (MonoError *error, const char *msg_format, ...);
 void
 mono_error_set_argument (MonoError *error, const char *argument, const char *msg_format, ...);
 
+void
+mono_error_set_argument_null (MonoError *oerror, const char *argument, const char *msg_format, ...);
+
 void
 mono_error_set_not_verifiable (MonoError *oerror, MonoMethod *method, const char *msg_format, ...);
 
@@ -77,7 +94,19 @@ void
 mono_error_set_generic_error (MonoError *error, const char * name_space, const char *name, const char *msg_format, ...);
 
 void
-mono_error_set_from_loader_error (MonoError *error);
+mono_error_set_execution_engine (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_not_implemented (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_not_supported (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_invalid_operation (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_exception_instance (MonoError *error, MonoException *exc);
 
 MonoException*
 mono_error_prepare_exception (MonoError *error, MonoError *error_out);
@@ -89,6 +118,6 @@ void
 mono_error_raise_exception (MonoError *error);
 
 void
-mono_loader_set_error_from_mono_error (MonoError *oerror);
+mono_error_move (MonoError *dest, MonoError *src);
 
 #endif