X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdomain-internals.h;h=51d1e4666e46a8edea2f9f63a9faccdfc850a334;hb=bf484297f1e88a8906894e6e0bf4bcd10ba43802;hp=37402a55abe059731209345efb67bc12d2e19503;hpb=5d9434fcb3acc1ed7d3d30603faae797d672fe65;p=mono.git diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h index 37402a55abe..51d1e4666e4 100644 --- a/mono/metadata/domain-internals.h +++ b/mono/metadata/domain-internals.h @@ -8,6 +8,7 @@ #include #include #include +#include #include extern CRITICAL_SECTION mono_delegate_section; @@ -30,9 +31,34 @@ typedef struct { int loader_optimization; MonoBoolean disallow_binding_redirects; MonoBoolean disallow_code_downloads; + MonoObject *activation_arguments; /* it is System.Object in 1.x, ActivationArguments in 2.0 */ + MonoObject *domain_initializer; + MonoArray *domain_initializer_args; + MonoObject *application_trust; /* it is System.Object in 1.x, ApplicationTrust in 2.0 */ + MonoBoolean disallow_appbase_probe; + MonoArray *configuration_bytes; } MonoAppDomainSetup; -typedef GArray MonoJitInfoTable; +typedef struct _MonoJitInfoTable MonoJitInfoTable; +typedef struct _MonoJitInfoTableChunk MonoJitInfoTableChunk; + +#define MONO_JIT_INFO_TABLE_CHUNK_SIZE 64 + +struct _MonoJitInfoTableChunk +{ + int refcount; + volatile int num_elements; + volatile gint8 *last_code_end; + MonoJitInfo * volatile data [MONO_JIT_INFO_TABLE_CHUNK_SIZE]; +}; + +struct _MonoJitInfoTable +{ + int num_chunks; + MonoJitInfoTableChunk *chunks [MONO_ZERO_LEN_ARRAY]; +}; + +typedef GArray MonoAotModuleInfoTable; typedef struct { guint32 flags; @@ -46,12 +72,25 @@ typedef struct { } data; } MonoJitExceptionInfo; +/* + * Will contain information on the generic type arguments in the + * future. For now, all arguments are always reference types. + */ +typedef struct { + int dummy; +} MonoGenericSharingContext; + struct _MonoJitInfo { + /* NOTE: These first two elements (method and + next_jit_code_hash) must be in the same order and at the + same offset as in RuntimeMethod, because of the jit_code_hash + internal hash table in MonoDomain. */ MonoMethod *method; + struct _MonoJitInfo *next_jit_code_hash; gpointer code_start; guint32 used_regs; int code_size; - guint32 num_clauses:24; + guint32 num_clauses:16; /* Whenever the code is domain neutral or 'shared' */ gboolean domain_neutral:1; gboolean cas_inited:1; @@ -61,7 +100,9 @@ struct _MonoJitInfo { gboolean cas_method_assert:1; gboolean cas_method_deny:1; gboolean cas_method_permitonly:1; + gboolean has_generic_sharing_context:1; MonoJitExceptionInfo clauses [MONO_ZERO_LEN_ARRAY]; + /* There is an optional MonoGenericSharingContext* after the clauses */ }; typedef struct { @@ -82,6 +123,8 @@ typedef enum { MONO_APPDOMAIN_UNLOADED } MonoAppDomainState; +typedef struct _MonoJitCodeHash MonoJitCodeHash; + struct _MonoDomain { CRITICAL_SECTION lock; MonoMemPool *mp; @@ -113,18 +156,22 @@ struct _MonoDomain { guint32 state; /* Needed by Thread:GetDomainID() */ gint32 domain_id; + gint32 shadow_serial; GSList *domain_assemblies; MonoAssembly *entry_assembly; char *friendly_name; GHashTable *class_vtable_hash; /* maps remote class key -> MonoRemoteClass */ GHashTable *proxy_vtable_hash; - GHashTable *jit_code_hash; + MonoInternalHashTable jit_code_hash; /* maps MonoMethod -> MonoJitDynamicMethodInfo */ GHashTable *dynamic_code_hash; - MonoJitInfoTable *jit_info_table; + MonoJitInfoTable * + volatile jit_info_table; /* Used when loading assemblies */ gchar **search_path; + gchar *private_bin_path; + /* Used by remoting proxies */ MonoMethod *create_proxy_for_type_method; MonoMethod *private_invoke_method; @@ -142,6 +189,8 @@ struct _MonoDomain { GHashTable *finalizable_objects_hash; /* Used when accessing 'domain_assemblies' */ CRITICAL_SECTION assemblies_lock; + + GHashTable *shared_generics_hash; }; typedef struct { @@ -160,6 +209,9 @@ typedef struct { #define mono_domain_assemblies_lock(domain) EnterCriticalSection(&(domain)->assemblies_lock) #define mono_domain_assemblies_unlock(domain) LeaveCriticalSection(&(domain)->assemblies_lock) +void +mono_init_com_types (void) MONO_INTERNAL; + void mono_cleanup (void) MONO_INTERNAL; @@ -172,6 +224,19 @@ mono_jit_info_table_remove (MonoDomain *domain, MonoJitInfo *ji) MONO_INTERNAL; void mono_jit_info_add_aot_module (MonoImage *image, gpointer start, gpointer end) MONO_INTERNAL; +MonoGenericSharingContext* +mono_jit_info_get_generic_sharing_context (MonoJitInfo *ji) MONO_INTERNAL; + +void +mono_jit_info_set_generic_sharing_context (MonoJitInfo *ji, MonoGenericSharingContext *gsctx) MONO_INTERNAL; + +MonoJitInfo* +mono_domain_lookup_shared_generic (MonoDomain *domain, MonoMethod *method) MONO_INTERNAL; + +void +mono_domain_register_shared_generic (MonoDomain *domain, MonoMethod *method, MonoJitInfo *jit_info) MONO_INTERNAL; + + /* * Installs a new function which is used to return a MonoJitInfo for a method inside * an AOT module. @@ -179,6 +244,9 @@ mono_jit_info_add_aot_module (MonoImage *image, gpointer start, gpointer end) MO typedef MonoJitInfo *(*MonoJitInfoFindInAot) (MonoDomain *domain, MonoImage *image, gpointer addr); void mono_install_jit_info_find_in_aot (MonoJitInfoFindInAot func) MONO_INTERNAL; +void +mono_jit_code_hash_init (MonoInternalHashTable *jit_code_hash) MONO_INTERNAL; + MonoAppDomain * ves_icall_System_AppDomain_getCurDomain (void) MONO_INTERNAL; @@ -279,7 +347,19 @@ mono_assembly_name_parse (const char *name, MonoAssemblyName *aname) MONO_INTERN void mono_assembly_name_free (MonoAssemblyName *aname) MONO_INTERNAL; +MonoImage *mono_assembly_open_from_bundle (const char *filename, + MonoImageOpenStatus *status, + gboolean refonly) MONO_INTERNAL; + void mono_domain_add_class_static_data (MonoDomain *domain, MonoClass *klass, gpointer data, guint32 *bitmap); +MonoReflectionAssembly * +mono_try_assembly_resolve (MonoDomain *domain, MonoString *fname, gboolean refonly) MONO_INTERNAL; + +MonoAssembly* mono_assembly_load_full_nosearch (MonoAssemblyName *aname, + const char *basedir, + MonoImageOpenStatus *status, + gboolean refonly) MONO_INTERNAL; + #endif /* __MONO_METADATA_DOMAIN_INTERNALS_H__ */