X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fexception.h;h=66a8d3a19cd2ad265a765e1a12988e05e41ec4cf;hb=4e4851142302b80c66174d23dffb42a87cb7948c;hp=f9aef3a0ef9424abf39af6622e19c62c8b35fb37;hpb=895100191521d75a7a42bfdb17befe6d3599e5ab;p=mono.git

diff --git a/mono/metadata/exception.h b/mono/metadata/exception.h
index f9aef3a0ef9..66a8d3a19cd 100644
--- a/mono/metadata/exception.h
+++ b/mono/metadata/exception.h
@@ -1,34 +1,29 @@
 #ifndef _MONO_METADATA_EXCEPTION_H_
 #define _MONO_METADATA_EXCEPTION_H_
 
-#ifdef MONO_USE_EXC_TABLES
-#define MONO_ARCH_SAVE_REGS __builtin_unwind_init ()
-#else
+/* here for compat: should not be used anymore */
 #define MONO_ARCH_SAVE_REGS 
-#endif
 
 #include <mono/metadata/object.h>
 #include <mono/metadata/image.h>
 
-typedef void (*MonoExceptionClassInitFunc)(MonoClass *klass);
-typedef void (*MonoExceptionObjectInitFunc)(MonoObject *obj, MonoClass *klass);
-
-extern void
-mono_exception_install_handlers (MonoExceptionClassInitFunc class_init,
-				 MonoExceptionObjectInitFunc obj_init);
+G_BEGIN_DECLS
 
 extern MonoException *
 mono_exception_from_name               (MonoImage *image, 
 					const char* name_space, 
 					const char *name);
 
+MonoException *
+mono_exception_from_token              (MonoImage *image, guint32 token);
+
 MonoException *
 mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
 				      const char *name, MonoString *a1, MonoString *a2);
 
 MonoException *
 mono_exception_from_name_msg	       (MonoImage *image, const char *name_space,
-					const char *name, const guchar *msg);
+					const char *name, const char *msg);
 
 extern MonoException *
 mono_exception_from_name_domain        (MonoDomain *domain, MonoImage *image, 
@@ -51,20 +46,23 @@ MonoException *
 mono_get_exception_null_reference      (void);
 
 MonoException *
-mono_get_exception_execution_engine    (const guchar *msg);
+mono_get_exception_execution_engine    (const char *msg);
 
 MonoException *
 mono_get_exception_thread_abort        (void);
 
 MonoException *
-mono_get_exception_thread_state        (const guchar *msg);
+mono_get_exception_thread_state        (const char *msg);
 
 MonoException *
-mono_get_exception_serialization       (const guchar *msg);
+mono_get_exception_serialization       (const char *msg);
 
 MonoException *
 mono_get_exception_invalid_cast        (void);
 
+MonoException *
+mono_get_exception_invalid_operation (const char *msg);
+
 MonoException *
 mono_get_exception_index_out_of_range  (void);
 
@@ -78,39 +76,47 @@ MonoException *
 mono_get_exception_missing_method      (void);
 
 MonoException *
-mono_get_exception_not_implemented     (const guchar *msg);
+mono_get_exception_not_implemented     (const char *msg);
 
 MonoException*
-mono_get_exception_argument_null       (const guchar *arg);
+mono_get_exception_argument_null       (const char *arg);
 
 MonoException *
-mono_get_exception_argument            (const guchar *arg, const guchar *msg);
+mono_get_exception_argument            (const char *arg, const char *msg);
 
 MonoException *
-mono_get_exception_argument_out_of_range (const guchar *arg);
+mono_get_exception_argument_out_of_range (const char *arg);
 
 MonoException *
-mono_get_exception_io                    (const guchar *msg);
+mono_get_exception_io                    (const char *msg);
 
 MonoException *
 mono_get_exception_file_not_found        (MonoString *fname);
 
+MonoException *
+mono_get_exception_file_not_found2       (const char *msg, MonoString *fname);
+
 MonoException *
 mono_get_exception_type_initialization (const gchar *type_name, MonoException *inner);
 
 MonoException *
-mono_get_exception_synchronization_lock (const guchar *msg);
+mono_get_exception_synchronization_lock (const char *msg);
 
 MonoException *
-mono_get_exception_cannot_unload_appdomain (const guchar *msg);
+mono_get_exception_cannot_unload_appdomain (const char *msg);
 
 MonoException *
 mono_get_exception_appdomain_unloaded (void);
 
 MonoException *
-mono_get_exception_bad_image_format (const guchar *msg);
+mono_get_exception_bad_image_format (const char *msg);
 
 MonoException *
 mono_get_exception_stack_overflow (void);
 
+MonoException *
+mono_get_exception_reflection_type_load (MonoArray *types, MonoArray *exceptions);
+
+G_END_DECLS
+
 #endif /* _MONO_METADATA_EXCEPTION_H_ */