2004-12-03 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h
index fc877b66b40b12dae73b3cab074a81d15772509b..b7f8db6b5ec0e65274754d6d91a557d6f2d0c166 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -10,7 +10,7 @@
 
 extern gboolean mono_print_vtable;
 
-typedef void     (*MonoStackWalkImpl) (MonoStackWalk func, gpointer user_data);
+typedef void     (*MonoStackWalkImpl) (MonoStackWalk func, gboolean do_il_offset, gpointer user_data);
 
 typedef struct _MonoMethodNormal MonoMethodNormal;
 typedef struct _MonoMethodWrapper MonoMethodWrapper;
@@ -27,6 +27,8 @@ typedef enum {
        MONO_WRAPPER_MANAGED_TO_NATIVE,
        MONO_WRAPPER_REMOTING_INVOKE,
        MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK,
+       MONO_WRAPPER_XDOMAIN_INVOKE,
+       MONO_WRAPPER_XDOMAIN_DISPATCH,
        MONO_WRAPPER_LDFLD,
        MONO_WRAPPER_STFLD,
        MONO_WRAPPER_SYNCHRONIZED,
@@ -38,16 +40,18 @@ typedef enum {
        MONO_WRAPPER_UNKNOWN
 } MonoWrapperType;
 
+typedef enum {
+       MONO_REMOTING_TARGET_UNKNOWN,
+       MONO_REMOTING_TARGET_APPDOMAIN
+} MonoRemotingTarget;
+
 struct _MonoMethod {
        guint16 flags;  /* method flags */
        guint16 iflags; /* method implementation flags */
        guint32 token;
        MonoClass *klass;
        MonoMethodSignature *signature;
-       gpointer addr;
        gpointer info; /* runtime info */
-       gpointer remoting_tramp; 
-       gint slot;
        /* name is useful mostly for debugging */
        const char *name;
        /* this is used by the inlining algorithm */
@@ -56,12 +60,13 @@ struct _MonoMethod {
        unsigned int wrapper_type:5;
        unsigned int string_ctor:1;
        unsigned int save_lmf:1;
-       gint16 inline_count;
+       unsigned int dynamic:1; /* created & destroyed during runtime */
+       gint slot : 22;
 };
 
 struct _MonoMethodNormal {
        MonoMethod method;
-       MonoGenericParam *gen_params;
+       MonoGenericContainer *generic_container;
        MonoMethodHeader *header;
 };
 
@@ -78,7 +83,7 @@ struct _MonoMethodInflated {
 
 struct _MonoMethodPInvoke {
        MonoMethod method;
-       void  (*code) (void);
+       gpointer addr;
        /* add marshal info */
        guint16 piflags;  /* pinvoke flags */
        guint16 implmap_idx;  /* index into IMPLMAP */
@@ -206,6 +211,7 @@ struct _MonoClass {
        guint delegate        : 1; /* class is a Delegate */
        guint gc_descr_inited : 1; /* gc_descr is initialized */
        guint dummy           : 1; /* temporary hack */
+       guint32 declsec_flags;     /* declarative security attributes flags */
 
        MonoClass  *parent;
        MonoClass  *nested_in;
@@ -259,9 +265,8 @@ struct _MonoClass {
        MonoType this_arg;
        MonoType byval_arg;
 
-       MonoGenericInst *generic_inst;
-       MonoGenericParam *gen_params;
-       guint16 num_gen_params;
+       MonoGenericClass *generic_class;
+       MonoGenericContainer *generic_container;
 
        void *reflection_info;
 
@@ -297,22 +302,28 @@ struct MonoVTable {
  * Generic instantiation data type encoding.
  */
 struct _MonoGenericInst {
+       int id;
+       int type_argc  : 23;
+       int is_open    : 1;
+       MonoType **type_argv;
+};
+
+struct _MonoGenericClass {
+       MonoGenericInst *inst;
+       MonoGenericContainer *container;
        MonoGenericContext *context;
        MonoClass *klass;
        MonoType *parent;
        int count_ifaces;
        MonoType **ifaces;
        MonoType *generic_type;
-       MonoDynamicGenericInst *dynamic_info;
-       int type_argc;
-       MonoType **type_argv;
-       guint is_open       : 1;
+       MonoDynamicGenericClass *dynamic_info;
        guint initialized   : 1;
        guint init_pending  : 1;
        guint is_dynamic    : 1;
 };
 
-struct _MonoDynamicGenericInst {
+struct _MonoDynamicGenericClass {
        int count_methods;
        MonoMethod **methods;
        int count_ctors;
@@ -326,18 +337,30 @@ struct _MonoDynamicGenericInst {
 };
 
 struct _MonoGenericMethod {
+       MonoGenericInst *inst;
+       MonoGenericContainer *container;
        gpointer reflection_info;
-       int mtype_argc;
-       MonoType **mtype_argv;
-       guint is_open       : 1;
 };
 
 struct _MonoGenericContext {
-       MonoGenericInst *ginst;
+       MonoGenericContainer *container;
+       MonoGenericClass *gclass;
        MonoGenericMethod *gmethod;
 };
 
+struct _MonoGenericContainer {
+       MonoGenericContainer *parent;
+       MonoGenericContext *context;
+       GHashTable *method_hash;
+       MonoClass *klass;
+       int type_argc    : 6;
+       int is_method    : 1;
+       int is_signature : 1;
+       MonoGenericParam *type_params;
+};
+
 struct _MonoGenericParam {
+       MonoGenericContainer *owner;
        MonoClass *pklass;
        MonoMethod *method;
        const char *name;
@@ -371,6 +394,7 @@ typedef struct {
 extern MonoStats mono_stats;
 
 typedef gpointer (*MonoTrampoline)       (MonoMethod *method);
+typedef gpointer (*MonoRemotingTrampoline)       (MonoMethod *method, MonoRemotingTarget target);
 
 typedef gpointer (*MonoLookupDynamicToken) (MonoImage *image, guint32 token);
 
@@ -392,6 +416,9 @@ mono_class_setup_parent    (MonoClass *klass, MonoClass *parent);
 void
 mono_class_setup_supertypes (MonoClass *klass);
 
+GPtrArray*
+mono_class_get_implemented_interfaces (MonoClass *klass);
+
 gboolean
 mono_class_is_open_constructed_type (MonoType *t);
 
@@ -405,7 +432,7 @@ void
 mono_install_trampoline (MonoTrampoline func);
 
 void
-mono_install_remoting_trampoline (MonoTrampoline func);
+mono_install_remoting_trampoline (MonoRemotingTrampoline func);
 
 gpointer
 mono_lookup_dynamic_token (MonoImage *image, guint32 token);
@@ -413,6 +440,12 @@ mono_lookup_dynamic_token (MonoImage *image, guint32 token);
 void
 mono_install_lookup_dynamic_token (MonoLookupDynamicToken func);
 
+void
+mono_class_create_generic (MonoGenericClass *gclass);
+
+void
+mono_class_create_generic_2 (MonoGenericClass *gclass);
+
 typedef struct {
        MonoImage *corlib;
        MonoClass *object_class;
@@ -486,7 +519,7 @@ mono_method_get_wrapper_data (MonoMethod *method, guint32 id);
 void
 mono_install_stack_walk (MonoStackWalkImpl func);
 
-MonoGenericParam *mono_metadata_load_generic_params (MonoImage *image, guint32 token, guint32 *num);
+MonoGenericContainer *mono_metadata_load_generic_params (MonoImage *image, guint32 token);
 
 MonoMethodSignature*
 mono_create_icall_signature (const char *sigstr);