2004-01-19 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mono / metadata / exception.c

diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index 4fce87ff16aed16d3d2cbb0b58d293bbe085ef84..14559ffde38af8d0b874b790f18258f2eb7b8870 100644 (file)
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -29,7 +29,15 @@ MonoException *
 mono_exception_from_name (MonoImage *image, const char *name_space,
                          const char *name)
 {
-       MonoDomain *domain = mono_domain_get ();
+       return mono_exception_from_name_domain (mono_domain_get (), image, name_space, name);
+}
+
+MonoException *
+mono_exception_from_name_domain (MonoDomain *domain,
+                                                                MonoImage *image, 
+                                                                const char* name_space, 
+                                                                const char *name)
+{
        MonoClass *klass;
        MonoObject *o;
 
@@ -58,7 +66,7 @@ mono_exception_from_name (MonoImage *image, const char *name_space,
  */
 static MonoException *
 mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
-                                     const char *name, MonoString *a1, MonoString *a2)
+                                                                         const char *name, MonoString *a1, MonoString *a2)
 {
        MonoDomain *domain = mono_domain_get ();
        MonoClass *klass;
@@ -91,6 +99,34 @@ mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
        return (MonoException *) o;
 }
 
+/**
+ * mono_exception_from_name_msg:
+ * @image: the Mono image where to look for the class
+ * @name_space: the namespace for the class
+ * @name: class name
+ * @msg: the message to embed inside the exception
+ *
+ * Creates an exception and initializes its message field.
+ *
+ * Returns: the initialized exception instance.
+ */
+MonoException *
+mono_exception_from_name_msg (MonoImage *image, const char *name_space,
+                                 const char *name, const guchar *msg)
+{
+       MonoException *ex;
+       MonoDomain *domain;
+
+    ex = mono_exception_from_name (image, name_space, name);
+
+       domain = ((MonoObject *)ex)->vtable->domain;
+
+       if (msg)
+               ex->message = mono_string_new (domain, msg);
+
+       return ex;
+}
+
 MonoException *
 mono_get_exception_divide_by_zero ()
 {
@@ -136,35 +172,15 @@ mono_get_exception_null_reference ()
 MonoException *
 mono_get_exception_execution_engine (const guchar *msg)
 {
-       MonoException *ex;
-       MonoDomain *domain;
-
-       ex = mono_exception_from_name (mono_defaults.corlib, "System",
-                                        "ExecutionEngineException");
-
-       domain = ((MonoObject *)ex)->vtable->domain;
-
-       if (msg)
-               ex->message = mono_string_new (domain, msg);
-
-       return ex;
+       return mono_exception_from_name_msg (mono_defaults.corlib, "System",
+                                                                                "ExecutionEngineException", msg);
 }
 
 MonoException *
 mono_get_exception_serialization (const guchar *msg)
 {
-       MonoException *ex;
-       MonoDomain *domain;
-
-       ex = mono_exception_from_name (mono_defaults.corlib, "System.Runtime.Serialization",
-                                      "SerializationException");
-
-       domain = ((MonoObject *)ex)->vtable->domain;
-
-       if (msg)
-               ex->message = mono_string_new (domain, msg);
-
-       return ex;
+       return mono_exception_from_name_msg (mono_defaults.corlib, "System.Runtime.Serialization",
+                                                                                "SerializationException", msg);
 }
 
 MonoException *
@@ -189,17 +205,32 @@ mono_get_exception_array_type_mismatch ()
 }
 
 MonoException *
-mono_get_exception_type_load ()
+mono_get_exception_type_load (MonoString *type_name)
 {
-       return mono_exception_from_name (mono_defaults.corlib, "System",
-                                        "TypeLoadException");
+       MonoTypeLoadException *exc;
+       
+       exc = (MonoTypeLoadException *) mono_exception_from_name (mono_defaults.corlib,
+                                       "System",
+                                       "TypeLoadException");
+
+       exc->type_name = type_name;
+       return (MonoException *) exc;
 }
 
 MonoException *
-mono_get_exception_not_implemented ()
+mono_get_exception_not_implemented (const guchar *msg)
 {
-       return mono_exception_from_name (mono_defaults.corlib, "System",
-                                        "NotImplementedException");
+       MonoException *ex;
+       MonoDomain *domain;
+       
+       ex = mono_exception_from_name (mono_defaults.corlib, "System",
+                                      "NotImplementedException");
+       domain = ((MonoObject *)ex)->vtable->domain;
+
+       if (msg)
+               ex->message = mono_string_new (domain, msg);
+
+       return ex;
 }
 
 MonoException *
@@ -215,8 +246,8 @@ mono_get_exception_argument_null (const guchar *arg)
        MonoException *ex;
        MonoDomain *domain;
 
-       ex = (MonoException *)mono_exception_from_name ( 
-               mono_defaults.corlib, "System", "ArgumentNullException");
+       ex = mono_exception_from_name ( 
+               mono_defaults.corlib, "System", "ArgumentNullException");
 
        domain = ((MonoObject *)ex)->vtable->domain;
 
@@ -233,14 +264,11 @@ mono_get_exception_argument (const guchar *arg, const guchar *msg)
        MonoException *ex;
        MonoDomain *domain;
 
-       ex = (MonoException *)mono_exception_from_name (
-               mono_defaults.corlib, "System", "ArgumentException");
+       ex = mono_exception_from_name_msg (
+               mono_defaults.corlib, "System", "ArgumentException", msg);
 
        domain = ((MonoObject *)ex)->vtable->domain;
 
-       if (msg)
-               ex->message = mono_string_new (domain, msg);
-       
        if (arg)
                ((MonoArgumentException *)ex)->param_name =
                        mono_string_new (domain, arg);
@@ -254,8 +282,8 @@ mono_get_exception_argument_out_of_range (const guchar *arg)
        MonoException *ex;
        MonoDomain *domain;
 
-       ex = (MonoException *)mono_exception_from_name (
-               mono_defaults.corlib, "System", "ArgumentOutOfRangeException");
+       ex = mono_exception_from_name (
+               mono_defaults.corlib, "System", "ArgumentOutOfRangeException");
 
        domain = ((MonoObject *)ex)->vtable->domain;
 
@@ -269,34 +297,16 @@ mono_get_exception_argument_out_of_range (const guchar *arg)
 MonoException *
 mono_get_exception_thread_state (const guchar *msg)
 {
-       MonoException *ex;
-       MonoDomain *domain;
-
-       ex = (MonoException *)mono_exception_from_name (
-               mono_defaults.corlib, "System.Threading", "ThreadStateException");
-
-       domain = ((MonoObject *)ex)->vtable->domain;
-
-       if (msg)
-               ex->message = mono_string_new (domain, msg);
-               
-       return ex;
+       return mono_exception_from_name_msg (mono_defaults.corlib, 
+                                                                                "System.Threading", "ThreadStateException",
+                                                                                msg);
 }
 
 MonoException *
 mono_get_exception_io (const guchar *msg)
 {
-       MonoException *ex;
-       MonoDomain *domain;
-
-       ex=(MonoException *)mono_exception_from_name ( 
-               mono_defaults.corlib, "System.IO", "IOException");
-
-       domain = ((MonoObject *)ex)->vtable->domain;
-
-       ex->message=mono_string_new (domain, msg);
-       
-       return(ex);
+       return mono_exception_from_name_msg ( 
+               mono_defaults.corlib, "System.IO", "IOException", msg);
 }
 
 MonoException *
@@ -339,3 +349,26 @@ mono_get_exception_type_initialization (const gchar *type_name, MonoException *i
        return (MonoException *) exc;
 }
 
+MonoException *
+mono_get_exception_synchronization_lock (const guchar *msg)
+{
+       return mono_exception_from_name_msg (mono_defaults.corlib, "System.Threading", "SynchronizationLockException", msg);
+}
+
+MonoException *
+mono_get_exception_cannot_unload_appdomain (const guchar *msg)
+{
+       return mono_exception_from_name_msg (mono_defaults.corlib, "System", "CannotUnloadAppDomainException", msg);
+}
+
+MonoException *
+mono_get_exception_appdomain_unloaded (void)
+{
+       return mono_exception_from_name (mono_defaults.corlib, "System", "AppDomainUnloadedException");
+}
+
+MonoException *
+mono_get_exception_bad_image_format (const guchar *msg)
+{
+       return mono_exception_from_name_msg (mono_defaults.corlib, "System", "BadImageFormatException", msg);
+}