2005-03-08 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index b8104845fa09a1810ab711cab891a90c904e141f..20d8d84ab008b56fb3a6cfb88f00c90fb2bc3d02 100644 (file)
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -35,11 +35,12 @@ typedef GArray MonoJitInfoTable;
 
 typedef struct {
        guint32  flags;
+       gint32   exvar_offset;
        gpointer try_start;
        gpointer try_end;
        gpointer handler_start;
        union {
-               guint32 token;
+               MonoClass *catch_class;
                gpointer filter;
        } data;
 } MonoJitExceptionInfo;
@@ -47,15 +48,26 @@ typedef struct {
 struct _MonoJitInfo {
        MonoMethod *method;
        gpointer    code_start;
-       int         code_size;
        guint32     used_regs;
-       unsigned    num_clauses;
-       signed      exvar_offset;
+       int         code_size;
+       guint32     num_clauses:24;
        /* Whenever the code is domain neutral or 'shared' */
        gboolean    domain_neutral:1;
-       MonoJitExceptionInfo *clauses;
+       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;
+       MonoJitExceptionInfo clauses [MONO_ZERO_LEN_ARRAY];
 };
 
+typedef struct {
+       MonoJitInfo *ji;
+       MonoCodeManager *code_mp;
+} MonoJitDynamicMethodInfo;
+
 struct _MonoAppContext {
        MonoObject obj;
        gint32 domain_id;
@@ -75,17 +87,21 @@ struct _MonoDomain {
        MonoMemPool        *mp;
        MonoCodeManager    *code_mp;
        MonoGHashTable     *env;
-       GHashTable         *assemblies_by_name;
-       GList              *assemblies;
+       GSList             *domain_assemblies;
        MonoAssembly       *entry_assembly;
        MonoAppDomainSetup *setup;
        char               *friendly_name;
        guint32            state;
        MonoGHashTable     *ldstr_table;
-       MonoGHashTable     *class_vtable_hash;
+       GHashTable         *class_vtable_hash;
+       /* maps MonoString -> MonoRemoteClass */
        MonoGHashTable     *proxy_vtable_hash;
        MonoGHashTable     *static_data_hash;
        GHashTable         *jit_code_hash;
+       /* maps MonoMethod -> MonoJitDynamicMethodInfo */
+       GHashTable         *dynamic_code_hash;
+       /* maps delegate trampoline addr -> delegate object */
+       MonoGHashTable     *delegate_hash_table;
        MonoJitInfoTable   *jit_info_table;
        /* hashtables for Reflection handles */
        MonoGHashTable     *type_hash;
@@ -104,8 +120,9 @@ struct _MonoDomain {
        /* Used to store offsets of thread and context static fields */
        GHashTable         *special_static_fields;
        GHashTable         *jump_target_hash;
-       MonoGHashTable     *class_init_trampoline_hash;
-       MonoGHashTable     *jump_trampoline_hash;
+       GHashTable         *class_init_trampoline_hash;
+       GHashTable         *jump_trampoline_hash;
+       GHashTable         *jit_trampoline_hash;
        /* 
         * This must be a GHashTable, since these objects can't be finalized
         * if the hashtable contains a GC visible reference to them.
@@ -113,6 +130,17 @@ struct _MonoDomain {
        GHashTable         *finalizable_objects_hash;
 };
 
+typedef struct  {
+       guint16 major, minor, build, revision;
+} AssemblyVersionSet;
+
+/* MonoRuntimeInfo: Contains information about versions supported by this runtime */
+typedef struct  {
+       const char runtime_version [12];
+       const char framework_version [4];
+       const AssemblyVersionSet version_sets [2];
+} MonoRuntimeInfo;
+
 #define mono_domain_lock(domain)   EnterCriticalSection(&(domain)->lock)
 #define mono_domain_unlock(domain) LeaveCriticalSection(&(domain)->lock)
 
@@ -126,7 +154,7 @@ MonoAppDomain *
 ves_icall_System_AppDomain_getCurDomain            (void);
 
 MonoAppDomain *
-ves_icall_System_AppDomain_getDomainByID           (gint32 domain_id);
+ves_icall_System_AppDomain_getRootDomain           (void);
 
 MonoAppDomain *
 ves_icall_System_AppDomain_createDomain            (MonoString         *friendly_name,
@@ -140,7 +168,8 @@ MonoReflectionAssembly *
 ves_icall_System_AppDomain_LoadAssemblyRaw         (MonoAppDomain *ad,
                                                    MonoArray *raw_assembly, 
                                                    MonoArray *raw_symbol_store,
-                                                   MonoObject *evidence);
+                                                   MonoObject *evidence,
+                                                   MonoBoolean refonly);
 
 void
 ves_icall_System_AppDomain_SetData                 (MonoAppDomain *ad, 
@@ -154,15 +183,18 @@ MonoString *
 ves_icall_System_AppDomain_getFriendlyName         (MonoAppDomain *ad);
 
 MonoArray *
-ves_icall_System_AppDomain_GetAssemblies           (MonoAppDomain *ad);
+ves_icall_System_AppDomain_GetAssemblies           (MonoAppDomain *ad,
+                                                   MonoBoolean refonly);
 
 MonoReflectionAssembly *
-ves_icall_System_Reflection_Assembly_LoadFrom      (MonoString *fname);
+ves_icall_System_Reflection_Assembly_LoadFrom      (MonoString *fname,
+                                                   MonoBoolean refonly);
 
 MonoReflectionAssembly *
 ves_icall_System_AppDomain_LoadAssembly            (MonoAppDomain *ad, 
                                                    MonoString *assRef,
-                                                   MonoObject    *evidence);
+                                                   MonoObject    *evidence,
+                                                   MonoBoolean refonly);
 
 gboolean
 ves_icall_System_AppDomain_InternalIsFinalizingForUnload (gint32 domain_id);
@@ -206,11 +238,10 @@ ves_icall_System_AppDomain_GetIDFromDomain (MonoAppDomain * ad);
 MonoString *
 ves_icall_System_AppDomain_InternalGetProcessGuid (MonoString* newguid);
 
-const char*
-mono_get_framework_version (void);
-
-const char*
-mono_get_runtime_version (void);
+MonoAssembly *
+mono_assembly_load_corlib (const MonoRuntimeInfo *runtime, MonoImageOpenStatus *status);
 
+const MonoRuntimeInfo*
+mono_get_runtime_info (void);
 
 #endif /* __MONO_METADATA_DOMAIN_INTERNALS_H__ */