#include "tabledefs.h"
#include "tokentype.h"
#include "metadata-internals.h"
+#include "profiler-private.h"
#include "loader.h"
#include <mono/io-layer/io-layer.h>
#include <mono/utils/mono-logger.h>
#include <mono/utils/mono-path.h>
+#include <mono/utils/mono-io-portability.h>
+#include <mono/metadata/class-internals.h>
+#include <mono/metadata/assembly.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#define INVALID_ADDRESS 0xffffffff
* Keeps track of the various assemblies loaded
*/
static GHashTable *loaded_images_hash;
-static GHashTable *loaded_images_guid_hash;
static GHashTable *loaded_images_refonly_hash;
-static GHashTable *loaded_images_refonly_guid_hash;
static gboolean debug_assembly_unload = FALSE;
InitializeCriticalSection (&images_mutex);
loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
- loaded_images_guid_hash = g_hash_table_new (g_str_hash, g_str_equal);
loaded_images_refonly_hash = g_hash_table_new (g_str_hash, g_str_equal);
- loaded_images_refonly_guid_hash = g_hash_table_new (g_str_hash, g_str_equal);
debug_assembly_unload = getenv ("MONO_DEBUG_ASSEMBLY_UNLOAD") != NULL;
}
DeleteCriticalSection (&images_mutex);
g_hash_table_destroy (loaded_images_hash);
- g_hash_table_destroy (loaded_images_guid_hash);
g_hash_table_destroy (loaded_images_refonly_hash);
- g_hash_table_destroy (loaded_images_refonly_guid_hash);
}
/**
return load_tables (image);
}
+void
+mono_image_check_for_module_cctor (MonoImage *image)
+{
+ MonoTableInfo *t, *mt;
+ t = &image->tables [MONO_TABLE_TYPEDEF];
+ mt = &image->tables [MONO_TABLE_METHOD];
+ if (mono_get_runtime_info ()->framework_version [0] == '1') {
+ image->checked_module_cctor = TRUE;
+ return;
+ }
+ if (image->dynamic) {
+ /* FIXME: */
+ image->checked_module_cctor = TRUE;
+ return;
+ }
+ if (t->rows >= 1) {
+ guint32 nameidx = mono_metadata_decode_row_col (t, 0, MONO_TYPEDEF_NAME);
+ const char *name = mono_metadata_string_heap (image, nameidx);
+ if (strcmp (name, "<Module>") == 0) {
+ guint32 first_method = mono_metadata_decode_row_col (t, 0, MONO_TYPEDEF_METHOD_LIST) - 1;
+ guint32 last_method;
+ if (t->rows > 1)
+ last_method = mono_metadata_decode_row_col (t, 1, MONO_TYPEDEF_METHOD_LIST) - 1;
+ else
+ last_method = mt->rows;
+ for (; first_method < last_method; first_method++) {
+ nameidx = mono_metadata_decode_row_col (mt, first_method, MONO_METHOD_NAME);
+ name = mono_metadata_string_heap (image, nameidx);
+ if (strcmp (name, ".cctor") == 0) {
+ image->has_module_cctor = TRUE;
+ image->checked_module_cctor = TRUE;
+ return;
+ }
+ }
+ }
+ }
+ image->has_module_cctor = FALSE;
+ image->checked_module_cctor = TRUE;
+}
+
static void
-load_modules (MonoImage *image, MonoImageOpenStatus *status)
+load_modules (MonoImage *image)
+{
+ MonoTableInfo *t;
+
+ if (image->modules)
+ return;
+
+ t = &image->tables [MONO_TABLE_MODULEREF];
+ image->modules = g_new0 (MonoImage *, t->rows);
+ image->modules_loaded = g_new0 (gboolean, t->rows);
+ image->module_count = t->rows;
+}
+
+/**
+ * mono_image_load_module:
+ *
+ * Load the module with the one-based index IDX from IMAGE and return it. Return NULL if
+ * it cannot be loaded.
+ */
+MonoImage*
+mono_image_load_module (MonoImage *image, int idx)
{
MonoTableInfo *t;
MonoTableInfo *file_table;
char *base_dir;
gboolean refonly = image->ref_only;
GList *list_iter, *valid_modules = NULL;
+ MonoImageOpenStatus status;
- if (image->modules)
- return;
+ g_assert (idx <= image->module_count);
+ if (image->modules_loaded [idx - 1])
+ return image->modules [idx - 1];
file_table = &image->tables [MONO_TABLE_FILE];
for (i = 0; i < file_table->rows; i++) {
}
t = &image->tables [MONO_TABLE_MODULEREF];
- image->modules = g_new0 (MonoImage *, t->rows);
- image->module_count = t->rows;
base_dir = g_path_get_dirname (image->name);
- for (i = 0; i < t->rows; i++){
+
+ {
char *module_ref;
const char *name;
guint32 cols [MONO_MODULEREF_SIZE];
- int valid = 0;
+ /* if there is no file table, we try to load the module... */
+ int valid = file_table->rows == 0;
- mono_metadata_decode_row (t, i, cols, MONO_MODULEREF_SIZE);
+ mono_metadata_decode_row (t, idx - 1, cols, MONO_MODULEREF_SIZE);
name = mono_metadata_string_heap (image, cols [MONO_MODULEREF_NAME]);
for (list_iter = valid_modules; list_iter; list_iter = list_iter->next) {
/* be safe with string dups, but we could just compare string indexes */
break;
}
}
- if (!valid)
- continue;
- module_ref = g_build_filename (base_dir, name, NULL);
- image->modules [i] = mono_image_open_full (module_ref, status, refonly);
- if (image->modules [i]) {
- mono_image_addref (image->modules [i]);
- /* g_print ("loaded module %s from %s (%p)\n", module_ref, image->name, image->assembly); */
+ if (valid) {
+ module_ref = g_build_filename (base_dir, name, NULL);
+ image->modules [idx - 1] = mono_image_open_full (module_ref, &status, refonly);
+ if (image->modules [idx - 1]) {
+ mono_image_addref (image->modules [idx - 1]);
+ image->modules [idx - 1]->assembly = image->assembly;
+ /* g_print ("loaded module %s from %s (%p)\n", module_ref, image->name, image->assembly); */
+ }
+ g_free (module_ref);
}
- /*
- * FIXME: We should probably do lazy-loading of modules.
- */
- if (status)
- *status = MONO_IMAGE_OK;
- g_free (module_ref);
}
+ image->modules_loaded [idx - 1] = TRUE;
+
g_free (base_dir);
g_list_free (valid_modules);
+
+ return image->modules [idx - 1];
}
-static void
-register_guid (gpointer key, gpointer value, gpointer user_data)
+static gpointer
+class_key_extract (gpointer value)
{
- MonoImage *image = (MonoImage*)value;
+ MonoClass *class = value;
- if (!g_hash_table_lookup (loaded_images_guid_hash, image))
- g_hash_table_insert (loaded_images_guid_hash, image->guid, image);
+ return GUINT_TO_POINTER (class->type_token);
}
-static void
-build_guid_table (gboolean refonly)
+static gpointer*
+class_next_value (gpointer value)
{
- GHashTable *loaded_images = refonly ? loaded_images_refonly_hash : loaded_images_hash;
- g_hash_table_foreach (loaded_images, register_guid, NULL);
+ MonoClass *class = value;
+
+ return (gpointer*)&class->next_class_cache;
}
void
mono_image_init (MonoImage *image)
{
- image->mempool = mono_mempool_new ();
+ image->mempool = mono_mempool_new_size (512);
image->method_cache = g_hash_table_new (NULL, NULL);
- image->class_cache = g_hash_table_new (NULL, NULL);
+ mono_internal_hash_table_init (&image->class_cache,
+ g_direct_hash,
+ class_key_extract,
+ class_next_value);
image->field_cache = g_hash_table_new (NULL, NULL);
image->delegate_begin_invoke_cache =
g_hash_table_new ((GHashFunc)mono_signature_hash,
(GCompareFunc)mono_metadata_signature_equal);
+ image->runtime_invoke_direct_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
image->managed_wrapper_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
image->native_wrapper_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
image->remoting_invoke_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
image->method_signatures = g_hash_table_new (NULL, NULL);
}
-static MonoImage *
-do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
- gboolean care_about_cli)
-{
- MonoCLIImageInfo *iinfo;
- MonoDotNetHeader *header;
- MonoMSDOSHeader msdos;
- guint32 offset = 0;
-
- mono_image_init (image);
-
- iinfo = image->image_info;
- header = &iinfo->cli_header;
-
- if (status)
- *status = MONO_IMAGE_IMAGE_INVALID;
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+#define SWAP64(x) (x) = GUINT64_FROM_LE ((x))
+#define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
+#define SWAP16(x) (x) = GUINT16_FROM_LE ((x))
+#define SWAPPDE(x) do { (x).rva = GUINT32_FROM_LE ((x).rva); (x).size = GUINT32_FROM_LE ((x).size);} while (0)
+#else
+#define SWAP64(x)
+#define SWAP32(x)
+#define SWAP16(x)
+#define SWAPPDE(x)
+#endif
- if (offset + sizeof (msdos) > image->raw_data_len)
- goto invalid_image;
- memcpy (&msdos, image->raw_data + offset, sizeof (msdos));
-
- if (!(msdos.msdos_sig [0] == 'M' && msdos.msdos_sig [1] == 'Z'))
- goto invalid_image;
-
- msdos.pe_offset = GUINT32_FROM_LE (msdos.pe_offset);
+/*
+ * Returns < 0 to indicate an error.
+ */
+static int
+do_load_header (MonoImage *image, MonoDotNetHeader *header, int offset)
+{
+ MonoDotNetHeader64 header64;
- offset = msdos.pe_offset;
+ if (offset + sizeof (MonoDotNetHeader32) > image->raw_data_len)
+ return -1;
- if (offset + sizeof (MonoDotNetHeader) > image->raw_data_len)
- goto invalid_image;
memcpy (header, image->raw_data + offset, sizeof (MonoDotNetHeader));
- offset += sizeof (MonoDotNetHeader);
-#if G_BYTE_ORDER != G_LITTLE_ENDIAN
-#define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
-#define SWAP16(x) (x) = GUINT16_FROM_LE ((x))
-#define SWAPPDE(x) do { (x).rva = GUINT32_FROM_LE ((x).rva); (x).size = GUINT32_FROM_LE ((x).size);} while (0)
+ if (header->pesig [0] != 'P' || header->pesig [1] != 'E')
+ return -1;
+
+ /* endian swap the fields common between PE and PE+ */
SWAP32 (header->coff.coff_time);
SWAP32 (header->coff.coff_symptr);
SWAP32 (header->coff.coff_symcount);
SWAP16 (header->coff.coff_attributes);
/* MonoPEHeader */
SWAP32 (header->pe.pe_code_size);
- SWAP32 (header->pe.pe_data_size);
SWAP32 (header->pe.pe_uninit_data_size);
SWAP32 (header->pe.pe_rva_entry_point);
SWAP32 (header->pe.pe_rva_code_base);
SWAP32 (header->pe.pe_rva_data_base);
SWAP16 (header->pe.pe_magic);
+ /* now we are ready for the basic tests */
+
+ if (header->pe.pe_magic == 0x10B) {
+ offset += sizeof (MonoDotNetHeader);
+ SWAP32 (header->pe.pe_data_size);
+ if (header->coff.coff_opt_header_size != (sizeof (MonoDotNetHeader) - sizeof (MonoCOFFHeader) - 4))
+ return -1;
+
+ SWAP32 (header->nt.pe_image_base); /* must be 0x400000 */
+ SWAP32 (header->nt.pe_stack_reserve);
+ SWAP32 (header->nt.pe_stack_commit);
+ SWAP32 (header->nt.pe_heap_reserve);
+ SWAP32 (header->nt.pe_heap_commit);
+ } else if (header->pe.pe_magic == 0x20B) {
+ /* PE32+ file format */
+ if (header->coff.coff_opt_header_size != (sizeof (MonoDotNetHeader64) - sizeof (MonoCOFFHeader) - 4))
+ return -1;
+ memcpy (&header64, image->raw_data + offset, sizeof (MonoDotNetHeader64));
+ offset += sizeof (MonoDotNetHeader64);
+ /* copy the fields already swapped. the last field, pe_data_size, is missing */
+ memcpy (&header64, header, sizeof (MonoDotNetHeader) - 4);
+ /* FIXME: we lose bits here, but we don't use this stuff internally, so we don't care much.
+ * will be fixed when we change MonoDotNetHeader to not match the 32 bit variant
+ */
+ SWAP64 (header64.nt.pe_image_base);
+ header->nt.pe_image_base = header64.nt.pe_image_base;
+ SWAP64 (header64.nt.pe_stack_reserve);
+ header->nt.pe_stack_reserve = header64.nt.pe_stack_reserve;
+ SWAP64 (header64.nt.pe_stack_commit);
+ header->nt.pe_stack_commit = header64.nt.pe_stack_commit;
+ SWAP64 (header64.nt.pe_heap_reserve);
+ header->nt.pe_heap_reserve = header64.nt.pe_heap_reserve;
+ SWAP64 (header64.nt.pe_heap_commit);
+ header->nt.pe_heap_commit = header64.nt.pe_heap_commit;
+
+ header->nt.pe_section_align = header64.nt.pe_section_align;
+ header->nt.pe_file_alignment = header64.nt.pe_file_alignment;
+ header->nt.pe_os_major = header64.nt.pe_os_major;
+ header->nt.pe_os_minor = header64.nt.pe_os_minor;
+ header->nt.pe_user_major = header64.nt.pe_user_major;
+ header->nt.pe_user_minor = header64.nt.pe_user_minor;
+ header->nt.pe_subsys_major = header64.nt.pe_subsys_major;
+ header->nt.pe_subsys_minor = header64.nt.pe_subsys_minor;
+ header->nt.pe_reserved_1 = header64.nt.pe_reserved_1;
+ header->nt.pe_image_size = header64.nt.pe_image_size;
+ header->nt.pe_header_size = header64.nt.pe_header_size;
+ header->nt.pe_checksum = header64.nt.pe_checksum;
+ header->nt.pe_subsys_required = header64.nt.pe_subsys_required;
+ header->nt.pe_dll_flags = header64.nt.pe_dll_flags;
+ header->nt.pe_loader_flags = header64.nt.pe_loader_flags;
+ header->nt.pe_data_dir_count = header64.nt.pe_data_dir_count;
+
+ /* copy the datadir */
+ memcpy (&header->datadir, &header64.datadir, sizeof (MonoPEDatadir));
+ } else {
+ return -1;
+ }
+
/* MonoPEHeaderNT: not used yet */
- SWAP32 (header->nt.pe_image_base); /* must be 0x400000 */
SWAP32 (header->nt.pe_section_align); /* must be 8192 */
SWAP32 (header->nt.pe_file_alignment); /* must be 512 or 4096 */
SWAP16 (header->nt.pe_os_major); /* must be 4 */
SWAP32 (header->nt.pe_checksum);
SWAP16 (header->nt.pe_subsys_required);
SWAP16 (header->nt.pe_dll_flags);
- SWAP32 (header->nt.pe_stack_reserve);
- SWAP32 (header->nt.pe_stack_commit);
- SWAP32 (header->nt.pe_heap_reserve);
- SWAP32 (header->nt.pe_heap_commit);
SWAP32 (header->nt.pe_loader_flags);
SWAP32 (header->nt.pe_data_dir_count);
SWAPPDE (header->datadir.pe_cli_header);
SWAPPDE (header->datadir.pe_reserved);
-#undef SWAP32
-#undef SWAP16
-#undef SWAPPDE
-#endif
+ return offset;
+}
- if (header->coff.coff_machine != 0x14c)
+static MonoImage *
+do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
+ gboolean care_about_cli)
+{
+ MonoCLIImageInfo *iinfo;
+ MonoDotNetHeader *header;
+ MonoMSDOSHeader msdos;
+ gint32 offset = 0;
+
+ mono_profiler_module_event (image, MONO_PROFILE_START_LOAD);
+
+ mono_image_init (image);
+
+ iinfo = image->image_info;
+ header = &iinfo->cli_header;
+
+ if (status)
+ *status = MONO_IMAGE_IMAGE_INVALID;
+
+ if (offset + sizeof (msdos) > image->raw_data_len)
goto invalid_image;
+ memcpy (&msdos, image->raw_data + offset, sizeof (msdos));
+
+ if (!(msdos.msdos_sig [0] == 'M' && msdos.msdos_sig [1] == 'Z'))
+ goto invalid_image;
+
+ msdos.pe_offset = GUINT32_FROM_LE (msdos.pe_offset);
- if (header->coff.coff_opt_header_size != (sizeof (MonoDotNetHeader) - sizeof (MonoCOFFHeader) - 4))
+ offset = msdos.pe_offset;
+
+ offset = do_load_header (image, header, offset);
+ if (offset < 0)
goto invalid_image;
- if (header->pesig[0] != 'P' || header->pesig[1] != 'E' || header->pe.pe_magic != 0x10B)
+ /*
+ * this tests for a x86 machine type, but itanium, amd64 and others could be used, too.
+ * we skip this test.
+ if (header->coff.coff_machine != 0x14c)
goto invalid_image;
+ */
#if 0
/*
mono_metadata_decode_row_col (&image->tables [MONO_TABLE_MODULE],
0, MONO_MODULE_NAME));
- load_modules (image, status);
+ load_modules (image);
done:
+ mono_profiler_module_loaded (image, MONO_PROFILE_OK);
if (status)
*status = MONO_IMAGE_OK;
return image;
invalid_image:
+ mono_profiler_module_loaded (image, MONO_PROFILE_FAILED);
mono_image_close (image);
return NULL;
}
struct stat stat_buf;
if ((filed = fopen (fname, "rb")) == NULL){
- if (status)
- *status = MONO_IMAGE_ERROR_ERRNO;
- return NULL;
+ if (IS_PORTABILITY_SET) {
+ gchar *ffname = mono_portability_find_file (fname, TRUE);
+ if (ffname) {
+ filed = fopen (ffname, "rb");
+ g_free (ffname);
+ }
+ }
+
+ if (filed == NULL) {
+ if (status)
+ *status = MONO_IMAGE_ERROR_ERRNO;
+ return NULL;
+ }
}
if (fstat (fileno (filed), &stat_buf)) {
return NULL;
}
image = g_new0 (MonoImage, 1);
- image->file_descr = filed;
+ image->raw_buffer_used = TRUE;
image->raw_data_len = stat_buf.st_size;
image->raw_data = mono_raw_buffer_load (fileno (filed), FALSE, 0, stat_buf.st_size);
iinfo = g_new0 (MonoCLIImageInfo, 1);
image->ref_only = refonly;
image->ref_count = 1;
+ fclose (filed);
+
return do_mono_image_load (image, status, care_about_cli);
}
return mono_image_loaded_full (name, FALSE);
}
+typedef struct {
+ MonoImage *res;
+ const char* guid;
+} GuidData;
+
+static void
+find_by_guid (gpointer key, gpointer val, gpointer user_data)
+{
+ GuidData *data = user_data;
+ MonoImage *image;
+
+ if (data->res)
+ return;
+ image = val;
+ if (strcmp (data->guid, mono_image_get_guid (image)) == 0)
+ data->res = image;
+}
+
MonoImage *
mono_image_loaded_by_guid_full (const char *guid, gboolean refonly)
{
- MonoImage *res;
- GHashTable *loaded_images = refonly ? loaded_images_refonly_guid_hash : loaded_images_guid_hash;
+ GuidData data;
+ GHashTable *loaded_images = refonly ? loaded_images_refonly_hash : loaded_images_hash;
+ data.res = NULL;
+ data.guid = guid;
mono_images_lock ();
- res = g_hash_table_lookup (loaded_images, guid);
+ g_hash_table_foreach (loaded_images, find_by_guid, &data);
mono_images_unlock ();
- return res;
+ return data.res;
}
MonoImage *
g_hash_table_insert (loaded_images, image->name, image);
if (image->assembly_name && (g_hash_table_lookup (loaded_images, image->assembly_name) == NULL))
g_hash_table_insert (loaded_images, (char *) image->assembly_name, image);
- g_hash_table_insert (image->ref_only ? loaded_images_refonly_guid_hash : loaded_images_guid_hash, image->guid, image);
mono_images_unlock ();
return image;
mono_image_close (MonoImage *image)
{
MonoImage *image2;
- GHashTable *loaded_images, *loaded_images_guid;
+ GHashTable *loaded_images;
int i;
g_return_if_fail (image != NULL);
if (InterlockedDecrement (&image->ref_count) > 0)
return;
+ mono_profiler_module_event (image, MONO_PROFILE_START_UNLOAD);
+
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading image %s [%p].", image->name, image);
-
+
+ mono_metadata_clean_for_image (image);
+
+ /*
+ * The caches inside a MonoImage might refer to metadata which is stored in referenced
+ * assemblies, so we can't release these references in mono_assembly_close () since the
+ * MonoImage might outlive its associated MonoAssembly.
+ */
+ if (image->references) {
+ int i;
+
+ for (i = 0; image->references [i]; i++) {
+ if (image->references [i])
+ mono_assembly_close (image->references [i]);
+ }
+
+ g_free (image->references);
+ image->references = NULL;
+ }
+
mono_images_lock ();
loaded_images = image->ref_only ? loaded_images_refonly_hash : loaded_images_hash;
- loaded_images_guid = image->ref_only ? loaded_images_refonly_guid_hash : loaded_images_guid_hash;
image2 = g_hash_table_lookup (loaded_images, image->name);
if (image == image2) {
/* This is not true if we are called from mono_image_open () */
g_hash_table_remove (loaded_images, image->name);
- g_hash_table_remove (loaded_images_guid, image->guid);
}
if (image->assembly_name && (g_hash_table_lookup (loaded_images, image->assembly_name) == image))
g_hash_table_remove (loaded_images, (char *) image->assembly_name);
- /* Multiple images might have the same guid */
- build_guid_table (image->ref_only);
-
mono_images_unlock ();
- if (image->file_descr) {
- fclose (image->file_descr);
- image->file_descr = NULL;
+ if (image->raw_buffer_used) {
if (image->raw_data != NULL)
mono_raw_buffer_free (image->raw_data);
}
}
g_hash_table_destroy (image->method_cache);
- g_hash_table_destroy (image->class_cache);
+ mono_internal_hash_table_destroy (&image->class_cache);
g_hash_table_destroy (image->field_cache);
if (image->array_cache) {
g_hash_table_foreach (image->array_cache, free_array_cache_entry, NULL);
g_hash_table_destroy (image->delegate_begin_invoke_cache);
g_hash_table_destroy (image->delegate_end_invoke_cache);
g_hash_table_destroy (image->delegate_invoke_cache);
+ if (image->delegate_abstract_invoke_cache)
+ g_hash_table_destroy (image->delegate_abstract_invoke_cache);
g_hash_table_foreach (image->remoting_invoke_cache, free_remoting_wrappers, NULL);
g_hash_table_destroy (image->remoting_invoke_cache);
g_hash_table_destroy (image->runtime_invoke_cache);
+ g_hash_table_destroy (image->runtime_invoke_direct_cache);
g_hash_table_destroy (image->synchronized_cache);
g_hash_table_destroy (image->unbox_wrapper_cache);
g_hash_table_destroy (image->cominterop_invoke_cache);
g_hash_table_destroy (image->helper_signatures);
g_hash_table_destroy (image->method_signatures);
+ if (image->generic_class_cache)
+ g_hash_table_destroy (image->generic_class_cache);
+
+ if (image->rgctx_template_hash)
+ g_hash_table_destroy (image->rgctx_template_hash);
+
+ if (image->generic_class_open_instances_hash)
+ g_hash_table_destroy (image->generic_class_open_instances_hash);
+
if (image->interface_bitset) {
mono_unload_interface_ids (image->interface_bitset);
mono_bitset_free (image->interface_bitset);
}
if (image->modules)
g_free (image->modules);
+ if (image->modules_loaded)
+ g_free (image->modules_loaded);
if (image->references)
g_free (image->references);
/*g_print ("destroy image %p (dynamic: %d)\n", image, image->dynamic);*/
}
mono_mempool_destroy (image->mempool);
}
+
+ mono_profiler_module_event (image, MONO_PROFILE_END_UNLOAD);
}
/**
MonoPEResourceDirEntry *entry,
MonoPEResourceDir *root, guint32 level)
{
- gboolean is_string=entry->name_is_string;
+ gboolean is_string, is_dir;
+ guint32 name_offset, dir_offset;
/* Level 0 holds a directory entry for each type of resource
* (identified by ID or name).
* Level 2 holds a directory entry for each language pointing to
* the actual data.
*/
+ name_offset = GUINT32_FROM_LE (entry->name_offset) & 0x7fffffff;
+ dir_offset = GUINT32_FROM_LE (entry->dir_offset) & 0x7fffffff;
+
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+ is_string = (GUINT32_FROM_LE (entry->name_offset) & 0x80000000) != 0;
+ is_dir = (GUINT32_FROM_LE (entry->dir_offset) & 0x80000000) != 0;
+#else
+ is_string = entry->name_is_string;
+ is_dir = entry->is_dir;
+#endif
if(level==0) {
- if((is_string==FALSE && entry->name_offset!=res_id) ||
+ if((is_string==FALSE && name_offset!=res_id) ||
(is_string==TRUE)) {
return(NULL);
}
} else if (level==1) {
#if 0
if(name!=NULL &&
- is_string==TRUE && name!=lookup (entry->name_offset)) {
+ is_string==TRUE && name!=lookup (name_offset)) {
return(NULL);
}
#endif
} else if (level==2) {
if ((is_string == FALSE &&
- entry->name_offset != lang_id &&
+ name_offset != lang_id &&
lang_id != 0) ||
(is_string == TRUE)) {
return(NULL);
g_assert_not_reached ();
}
- if(entry->is_dir==TRUE) {
- MonoPEResourceDir *res_dir=(MonoPEResourceDir *)(((char *)root)+entry->dir_offset);
+ if(is_dir==TRUE) {
+ MonoPEResourceDir *res_dir=(MonoPEResourceDir *)(((char *)root)+dir_offset);
MonoPEResourceDirEntry *sub_entries=(MonoPEResourceDirEntry *)(res_dir+1);
guint32 entries, i;
-
- entries=res_dir->res_named_entries + res_dir->res_id_entries;
+
+ entries = GUINT16_FROM_LE (res_dir->res_named_entries) + GUINT16_FROM_LE (res_dir->res_id_entries);
for(i=0; i<entries; i++) {
MonoPEResourceDirEntry *sub_entry=&sub_entries[i];
return(NULL);
} else {
- MonoPEResourceDataEntry *data_entry=(MonoPEResourceDataEntry *)((char *)(root)+entry->dir_offset);
-
- return(data_entry);
+ MonoPEResourceDataEntry *data_entry=(MonoPEResourceDataEntry *)((char *)(root)+dir_offset);
+ MonoPEResourceDataEntry *res;
+
+ res = g_new0 (MonoPEResourceDataEntry, 1);
+
+ res->rde_data_offset = GUINT32_TO_LE (data_entry->rde_data_offset);
+ res->rde_size = GUINT32_TO_LE (data_entry->rde_size);
+ res->rde_codepage = GUINT32_TO_LE (data_entry->rde_codepage);
+ res->rde_reserved = GUINT32_TO_LE (data_entry->rde_reserved);
+
+ return (res);
}
}
* @name: the resource name to lookup.
*
* Returns: NULL if not found, otherwise a pointer to the in-memory representation
- * of the given resource.
+ * of the given resource. The caller should free it using g_free () when no longer
+ * needed.
*/
gpointer
mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, gunichar2 *name)
if(resource_dir==NULL) {
return(NULL);
}
-
- entries=resource_dir->res_named_entries + resource_dir->res_id_entries;
+
+ entries = GUINT16_FROM_LE (resource_dir->res_named_entries) + GUINT16_FROM_LE (resource_dir->res_id_entries);
res_entries=(MonoPEResourceDirEntry *)(resource_dir+1);
for(i=0; i<entries; i++) {
if (fileidx < 1 || fileidx > t->rows)
return NULL;
- if (image->files && image->files [fileidx - 1])
+ mono_loader_lock ();
+ if (image->files && image->files [fileidx - 1]) {
+ mono_loader_unlock ();
return image->files [fileidx - 1];
+ }
if (!image->files)
image->files = g_new0 (MonoImage*, t->rows);
image->files [fileidx - 1] = res;
}
+ mono_loader_unlock ();
g_free (name);
g_free (base_dir);
return res;
{
const char *pubkey;
guint32 len, tok;
+
+ if (image->dynamic) {
+ if (size)
+ *size = ((MonoDynamicImage*)image)->public_key_len;
+ return (char*)((MonoDynamicImage*)image)->public_key;
+ }
if (image->tables [MONO_TABLE_ASSEMBLY].rows != 1)
return NULL;
tok = mono_metadata_decode_row_col (&image->tables [MONO_TABLE_ASSEMBLY], 0, MONO_ASSEMBLY_PUBLIC_KEY);
projects / mono.git / blobdiff