X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdomain-internals.h;h=b70d40695886a845801f4de7096dab6605952052;hb=8eeb2cef8fb37b7aaeed5fb0c31550a1701f9bdf;hp=97702e07c57883f44cb139768bff04e3f4687ded;hpb=d2e184bbf7f82d83d767aae6af08359729769270;p=mono.git diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h index 97702e07c57..b70d4069588 100644 --- a/mono/metadata/domain-internals.h +++ b/mono/metadata/domain-internals.h @@ -18,7 +18,6 @@ extern mono_mutex_t mono_delegate_section; -extern mono_mutex_t mono_strtod_mutex; /* * If this is set, the memory belonging to appdomains is not freed when a domain is @@ -101,13 +100,7 @@ typedef struct { * Contains information about the type arguments for generic shared methods. */ typedef struct { - /* - * If not NULL, determines whenever the class type arguments of the gshared method are references or vtypes. - * The array length is equal to class_inst->type_argv. - */ - gboolean *var_is_vt; - /* Same for method type parameters */ - gboolean *mvar_is_vt; + gboolean is_gsharedvt; } MonoGenericSharingContext; /* Simplified DWARF location list entry */ @@ -189,23 +182,12 @@ typedef struct { int thunks_size; } MonoThunkJitInfo; -typedef struct { - gboolean cas_inited:1; - gboolean cas_class_assert:1; - gboolean cas_class_deny:1; - gboolean cas_class_permitonly:1; - gboolean cas_method_assert:1; - gboolean cas_method_deny:1; - gboolean cas_method_permitonly:1; -} MonoMethodCasInfo; - typedef enum { JIT_INFO_NONE = 0, - JIT_INFO_HAS_CAS_INFO = (1 << 0), - JIT_INFO_HAS_GENERIC_JIT_INFO = (1 << 1), - JIT_INFO_HAS_TRY_BLOCK_HOLES = (1 << 2), - JIT_INFO_HAS_ARCH_EH_INFO = (1 << 3), - JIT_INFO_HAS_THUNK_INFO = (1 << 4) + JIT_INFO_HAS_GENERIC_JIT_INFO = (1 << 0), + JIT_INFO_HAS_TRY_BLOCK_HOLES = (1 << 1), + JIT_INFO_HAS_ARCH_EH_INFO = (1 << 2), + JIT_INFO_HAS_THUNK_INFO = (1 << 3) } MonoJitInfoFlags; struct _MonoJitInfo { @@ -226,7 +208,6 @@ struct _MonoJitInfo { guint32 num_clauses:15; /* Whenever the code is domain neutral or 'shared' */ gboolean domain_neutral:1; - gboolean has_cas_info:1; gboolean has_generic_jit_info:1; gboolean has_try_block_holes:1; gboolean has_arch_eh_info:1; @@ -297,13 +278,6 @@ typedef struct _MonoThunkFreeList { typedef struct _MonoJitCodeHash MonoJitCodeHash; -typedef struct _MonoTlsDataRecord MonoTlsDataRecord; -struct _MonoTlsDataRecord { - MonoTlsDataRecord *next; - guint32 tls_offset; - guint32 size; -}; - struct _MonoDomain { /* * This lock must never be taken before the loader lock, @@ -381,7 +355,6 @@ struct _MonoDomain { MonoMethod *private_invoke_method; /* Used to store offsets of thread and context static fields */ GHashTable *special_static_fields; - MonoTlsDataRecord *tlsrec_list; /* * This must be a GHashTable, since these objects can't be finalized * if the hashtable contains a GC visible reference to them. @@ -426,13 +399,6 @@ struct _MonoDomain { MonoClass *sockaddr_class; MonoClassField *sockaddr_data_field; - /* Used by threadpool.c */ - MonoImage *system_image; - MonoClass *corlib_asyncresult_class; - MonoClass *socket_class; - MonoClass *ad_unloaded_ex_class; - MonoClass *process_class; - /* Cache function pointers for architectures */ /* that require wrappers */ GHashTable *ftnptrs_hash; @@ -562,9 +528,6 @@ mono_jit_info_get_arch_eh_info (MonoJitInfo *ji); MonoThunkJitInfo* mono_jit_info_get_thunk_info (MonoJitInfo *ji); -MonoMethodCasInfo* -mono_jit_info_get_cas_info (MonoJitInfo *ji); - /* * Installs a new function which is used to return a MonoJitInfo for a method inside * an AOT module.