2004-05-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>

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

diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index 39ace16bb1ce7a5f093c89195665c9ac85539533..ce7d81cbf769509f196286c8bbdf897dd8dfa46a 100644 (file)
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -29,7 +29,13 @@ 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;
 
@@ -56,16 +62,19 @@ mono_exception_from_name (MonoImage *image, const char *name_space,
  *
  * Returns: the initialized exception instance.
  */
-static MonoException *
+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;
        MonoMethod *method = NULL;
        MonoObject *o;
-       int i;
+       int i, count = 1;
        gpointer args [2];
+
+       if (a2 != NULL)
+               count++;
        
        klass = mono_class_from_name (image, name_space, name);
        o = mono_object_new (domain, klass);
@@ -76,11 +85,12 @@ mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
                if (strcmp (".ctor", klass->methods [i]->name))
                        continue;
                sig = klass->methods [i]->signature;
-               if (sig->param_count != 2)
+               if (sig->param_count != count)
                        continue;
 
-               if (sig->params [0]->type != MONO_TYPE_STRING ||
-                   sig->params [1]->type != MONO_TYPE_STRING)
+               if (sig->params [0]->type != MONO_TYPE_STRING)
+                       continue;
+               if (count == 2 && sig->params [1]->type != MONO_TYPE_STRING)
                        continue;
                method = klass->methods [i];
        }
@@ -102,14 +112,14 @@ mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
  *
  * Returns: the initialized exception instance.
  */
-static MonoException *
+MonoException *
 mono_exception_from_name_msg (MonoImage *image, const char *name_space,
-                                                         const char *name, const guchar *msg)
+                             const char *name, const guchar *msg)
 {
        MonoException *ex;
        MonoDomain *domain;
 
-    ex = mono_exception_from_name (image, name_space, name);
+       ex = mono_exception_from_name (image, name_space, name);
 
        domain = ((MonoObject *)ex)->vtable->domain;
 
@@ -171,9 +181,6 @@ mono_get_exception_execution_engine (const guchar *msg)
 MonoException *
 mono_get_exception_serialization (const guchar *msg)
 {
-       MonoException *ex;
-       MonoDomain *domain;
-
        return mono_exception_from_name_msg (mono_defaults.corlib, "System.Runtime.Serialization",
                                                                                 "SerializationException", msg);
 }
@@ -213,10 +220,19 @@ mono_get_exception_type_load (MonoString *type_name)
 }
 
 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 *
@@ -283,9 +299,8 @@ mono_get_exception_argument_out_of_range (const guchar *arg)
 MonoException *
 mono_get_exception_thread_state (const guchar *msg)
 {
-       return mono_exception_from_name_msg (mono_defaults.corlib, 
-                                                                                "System.Threading", "ThreadStateException",
-                                                                                msg);
+       return mono_exception_from_name_msg (
+               mono_defaults.corlib, "System.Threading", "ThreadStateException", msg);
 }
 
 MonoException *
@@ -346,3 +361,21 @@ 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);
+}      
+
+MonoException *
+mono_get_exception_stack_overflow (void)
+{
+       return mono_exception_from_name (mono_defaults.corlib, "System", "StackOverflowException");     
+}