Wed Aug 29 18:37:37 CEST 2007 Paolo Molaro <lupus@ximian.com>

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

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index d8d739f7010ee9d0ce0e215322a002450b962370..8c48fe7d241676e683927ff83e67b361770102be 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -23,6 +23,7 @@
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/domain-internals.h>
 #include <mono/metadata/mono-endian.h>
+#include <mono/metadata/mono-debug.h>
 #include <mono/io-layer/io-layer.h>
 #include <mono/utils/mono-uri.h>
 #include <mono/metadata/mono-config.h>
@@ -72,7 +73,6 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"Mono.Cairo", 0},
        {"Mono.CompilerServices.SymbolWriter", 0},
        {"Mono.Data", 0},
-       {"Mono.Data.SqliteClient", 0},
        {"Mono.Data.SybaseClient", 0},
        {"Mono.Data.Tds", 0},
        {"Mono.Data.TdsClient", 0},
@@ -855,6 +855,8 @@ mono_assembly_load_reference (MonoImage *image, int index)
         * it inside a critical section.
         */
        mono_assemblies_lock ();
+       if (!image->references)
+               mono_assembly_load_references (image, &status);
        reference = image->references [index];
        mono_assemblies_unlock ();
        if (reference)
@@ -932,21 +934,12 @@ void
 mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
 {
        MonoTableInfo *t;
-       int i;
 
        *status = MONO_IMAGE_OK;
 
        t = &image->tables [MONO_TABLE_ASSEMBLYREF];
        
        image->references = g_new0 (MonoAssembly *, t->rows + 1);
-
-       /* resolve assembly references for modules */
-       for (i = 0; i < image->module_count; i++){
-               if (image->modules [i]) {
-                       image->modules [i]->assembly = image->assembly;
-                       mono_assembly_load_references (image->modules [i], status);
-               }
-       }
 }
 
 typedef struct AssemblyLoadHook AssemblyLoadHook;
@@ -1348,15 +1341,19 @@ mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboo
 }
 
 /*
- * load_friend_assemblies:
+ * mono_load_friend_assemblies:
  * @ass: an assembly
  *
  * Load the list of friend assemblies that are allowed to access
  * the assembly's internal types and members. They are stored as assembly
  * names in custom attributes.
+ *
+ * This is an internal method, we need this because when we load mscorlib
+ * we do not have the mono_defaults.internals_visible_class loaded yet,
+ * so we need to load these after we initialize the runtime. 
  */
-static void
-load_friend_assemblies (MonoAssembly* ass)
+void
+mono_assembly_load_friends (MonoAssembly* ass)
 {
        int i;
        MonoCustomAttrInfo* attrs = mono_custom_attrs_from_assembly (ass);
@@ -1517,7 +1514,7 @@ mono_assembly_load_from_full (MonoImage *image, const char*fname,
 
        loaded_assemblies = g_list_prepend (loaded_assemblies, ass);
        if (mono_defaults.internals_visible_class)
-               load_friend_assemblies (ass);
+               mono_assembly_load_friends (ass);
        mono_assemblies_unlock ();
 
        mono_assembly_invoke_load_hook (ass);
@@ -1762,7 +1759,13 @@ mono_assembly_name_parse_full (const char *name, MonoAssemblyName *aname, gboole
                        tmp++;
                        continue;
                }
-               
+
+               if (!g_ascii_strncasecmp (value, "ProcessorArchitecture=", 22)) {
+                       /* this is ignored for now, until we can change MonoAssemblyName */
+                       tmp++;
+                       continue;
+               }
+
                g_strfreev (parts);
                return FALSE;
        }
@@ -1807,7 +1810,8 @@ probe_for_partial_name (const char *basepath, const char *fullname, MonoAssembly
        while ((direntry = g_dir_read_name (dirhandle))) {
                gboolean match = TRUE;
                
-               parse_assembly_directory_name (aname->name, direntry, &gac_aname);
+               if(!parse_assembly_directory_name (aname->name, direntry, &gac_aname))
+                       continue;
                
                if (aname->culture != NULL && strcmp (aname->culture, gac_aname.culture) != 0)
                        match = FALSE;
@@ -2329,22 +2333,12 @@ mono_assembly_close (MonoAssembly *assembly)
 
        mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading assembly %s [%p].", assembly->aname.name, assembly);
 
+       mono_debug_close_image (assembly->image);
+
        mono_assemblies_lock ();
        loaded_assemblies = g_list_remove (loaded_assemblies, assembly);
        mono_assemblies_unlock ();
 
-       if (assembly->image->references) {
-               int i;
-
-               for (i = 0; assembly->image->references [i]; i++) {
-                       if (assembly->image->references [i])
-                               mono_assembly_close (assembly->image->references [i]);
-               }
-
-               g_free (assembly->image->references);
-               assembly->image->references = NULL;
-       }
-
        assembly->image->assembly = NULL;
 
        mono_image_close (assembly->image);