patch-quiet now works in systems with 'gsed'

[mono.git] / mono / metadata / metadata-internals.h

diff --git a/mono/metadata/metadata-internals.h b/mono/metadata/metadata-internals.h
index 6876b7df7ff2f38b18a05fc23c4bf0fb840037c3..40f65d0e96b2764d972523106f74d83edc7c02fe 100644 (file)
--- a/mono/metadata/metadata-internals.h
+++ b/mono/metadata/metadata-internals.h
@@ -39,6 +39,12 @@ struct _MonoType {
 
 #define MONO_PUBLIC_KEY_TOKEN_LENGTH   17
 
+#define MONO_PROCESSOR_ARCHITECTURE_NONE 0
+#define MONO_PROCESSOR_ARCHITECTURE_MSIL 1
+#define MONO_PROCESSOR_ARCHITECTURE_X86 2
+#define MONO_PROCESSOR_ARCHITECTURE_IA64 3
+#define MONO_PROCESSOR_ARCHITECTURE_AMD64 4
+
 struct _MonoAssemblyName {
        const char *name;
        const char *culture;
@@ -49,7 +55,7 @@ struct _MonoAssemblyName {
        uint32_t hash_alg;
        uint32_t hash_len;
        uint32_t flags;
-       uint16_t major, minor, build, revision;
+       uint16_t major, minor, build, revision, arch;
 };
 
 struct MonoTypeNameParse {
@@ -80,6 +86,10 @@ struct _MonoAssembly {
        guint8 dynamic;
        guint8 corlib_internal;
        gboolean ref_only;
+       guint8 wrap_non_exception_throws;
+       guint8 wrap_non_exception_throws_inited;
+       guint8 jit_optimizer_disabled;
+       guint8 jit_optimizer_disabled_inited;
        /* security manager flags (one bit is for lazy initialization) */
        guint32 ecma:2;         /* Has the ECMA key */
        guint32 aptc:2;         /* Has the [AllowPartiallyTrustedCallers] attributes */
@@ -250,6 +260,10 @@ struct _MonoImage {
         */
        GHashTable *delegate_abstract_invoke_cache;
 
+       /*
+        * indexed by SignatureMethodPair
+        */
+       GHashTable *delegate_bound_static_invoke_cache;
        /*
         * indexed by MonoMethod pointers 
         */
@@ -392,6 +406,7 @@ struct _MonoDynamicImage {
        GHashTable *method_to_table_idx;
        GHashTable *field_to_table_idx;
        GHashTable *method_aux_hash;
+       GHashTable *vararg_aux_hash;
        MonoGHashTable *generic_def_objects;
        MonoGHashTable *methodspec;
        gboolean run;
@@ -429,6 +444,7 @@ typedef struct _MonoAssemblyBindingInfo {
        guint has_old_version_top : 1;
        guint has_new_version : 1;
        guint is_valid : 1;
+       gint32 domain_id; /*Needed to unload per-domain binding*/
 } MonoAssemblyBindingInfo;
 
 struct _MonoMethodHeader {
@@ -489,6 +505,8 @@ mono_image_alloc  (MonoImage *image, guint size) MONO_INTERNAL;
 gpointer
 mono_image_alloc0 (MonoImage *image, guint size) MONO_INTERNAL;
 
+#define mono_image_new0(image,type,size) ((type *) mono_image_alloc0 (image, sizeof (type)* (size)))
+
 char*
 mono_image_strdup (MonoImage *image, const char *s) MONO_INTERNAL;
 
@@ -524,6 +542,20 @@ typedef void  (*MonoImageUnloadFunc) (MonoImage *image, gpointer user_data);
 void
 mono_install_image_unload_hook (MonoImageUnloadFunc func, gpointer user_data) MONO_INTERNAL;
 
+void
+mono_remove_image_unload_hook (MonoImageUnloadFunc func, gpointer user_data) MONO_INTERNAL;
+
+gpointer
+mono_image_set_alloc  (MonoImageSet *set, guint size) MONO_INTERNAL;
+
+gpointer
+mono_image_set_alloc0 (MonoImageSet *set, guint size) MONO_INTERNAL;
+
+char*
+mono_image_set_strdup (MonoImageSet *set, const char *s) MONO_INTERNAL;
+
+#define mono_image_set_new0(image,type,size) ((type *) mono_image_set_alloc0 (image, sizeof (type)* (size)))
+
 MonoType*
 mono_metadata_get_shared_type (MonoType *type) MONO_INTERNAL;
 
@@ -691,5 +723,7 @@ MonoException *mono_get_exception_field_access_msg (const char *msg) MONO_INTERN
 
 MonoException *mono_get_exception_method_access_msg (const char *msg) MONO_INTERNAL;
 
+MonoMethod* method_from_method_def_or_ref (MonoImage *m, guint32 tok, MonoGenericContext *context) MONO_INTERNAL;
+
 #endif /* __MONO_METADATA_INTERNALS_H__ */