2004-01-19 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/metadata/metadata.h b/mono/metadata/metadata.h
index ccc35e9fe7cbaa7a1a5f2d10ddf279c0b1c2643a..8f252d2111bde43a6251ce4b1dd2cd8e9464eb07 100644 (file)
--- a/mono/metadata/metadata.h
+++ b/mono/metadata/metadata.h
@@ -14,8 +14,10 @@
 #define MONO_ZERO_LEN_ARRAY 1
 #endif
 
-#define MONO_TYPE_ISSTRUCT(t) (!t->byref && t->type == MONO_TYPE_VALUETYPE && !t->data.klass->enumtype)
+#define MONO_TYPE_ISSTRUCT(t) (!(t)->byref && (((t)->type == MONO_TYPE_VALUETYPE && !(t)->data.klass->enumtype) || ((t)->type == MONO_TYPE_TYPEDBYREF)))
 #define MONO_TYPE_IS_VOID(t) ((t) && ((t)->type == MONO_TYPE_VOID) && !(t)->byref)
+#define MONO_TYPE_IS_POINTER(t) ((t) && (((t)->byref || ((t)->type == MONO_TYPE_I) || (t)->type == MONO_TYPE_STRING) || ((t)->type == MONO_TYPE_SZARRAY) || ((t)->type == MONO_TYPE_CLASS) || ((t)->type == MONO_TYPE_CLASS) || ((t)->type == MONO_TYPE_OBJECT) || ((t)->type == MONO_TYPE_ARRAY) || ((t)->type == MONO_TYPE_PTR)))
+#define MONO_TYPE_IS_REFERENCE(t) ((t) && (((t)->type == MONO_TYPE_STRING) || ((t)->type == MONO_TYPE_SZARRAY) || ((t)->type == MONO_TYPE_CLASS) || ((t)->type == MONO_TYPE_OBJECT) || ((t)->type == MONO_TYPE_ARRAY)))
 
 typedef struct _MonoClass MonoClass;
 typedef struct _MonoDomain MonoDomain;
@@ -31,13 +33,13 @@ typedef enum {
        MONO_TABLE_UNUSED3,
        MONO_TABLE_PARAM,
        MONO_TABLE_INTERFACEIMPL,
-       MONO_TABLE_MEMBERREF,
+       MONO_TABLE_MEMBERREF, /* 0xa */
        MONO_TABLE_CONSTANT,
        MONO_TABLE_CUSTOMATTRIBUTE,
        MONO_TABLE_FIELDMARSHAL,
        MONO_TABLE_DECLSECURITY,
        MONO_TABLE_CLASSLAYOUT,
-       MONO_TABLE_FIELDLAYOUT,
+       MONO_TABLE_FIELDLAYOUT, /* 0x10 */
        MONO_TABLE_STANDALONESIG,
        MONO_TABLE_EVENTMAP,
        MONO_TABLE_UNUSED4,
@@ -47,13 +49,13 @@ typedef enum {
        MONO_TABLE_PROPERTY,
        MONO_TABLE_METHODSEMANTICS,
        MONO_TABLE_METHODIMPL,
-       MONO_TABLE_MODULEREF,
+       MONO_TABLE_MODULEREF, /* 0x1a */
        MONO_TABLE_TYPESPEC,
        MONO_TABLE_IMPLMAP,
        MONO_TABLE_FIELDRVA,
        MONO_TABLE_UNUSED6,
        MONO_TABLE_UNUSED7,
-       MONO_TABLE_ASSEMBLY,
+       MONO_TABLE_ASSEMBLY, /* 0x20 */
        MONO_TABLE_ASSEMBLYPROCESSOR,
        MONO_TABLE_ASSEMBLYOS,
        MONO_TABLE_ASSEMBLYREF,
@@ -63,11 +65,11 @@ typedef enum {
        MONO_TABLE_EXPORTEDTYPE,
        MONO_TABLE_MANIFESTRESOURCE,
        MONO_TABLE_NESTEDCLASS,
-       MONO_TABLE_GENERICPARAM,
+       MONO_TABLE_GENERICPARAM, /* 0x2a */
        MONO_TABLE_METHODSPEC,
        MONO_TABLE_GENERICPARAMCONSTRAINT
 
-#define MONO_TABLE_LAST MONO_TABLE_NESTEDCLASS
+#define MONO_TABLE_LAST MONO_TABLE_GENERICPARAMCONSTRAINT
 } MonoMetaTableEnum;
 
 typedef enum {
@@ -156,11 +158,20 @@ typedef enum {
 
 typedef struct {
        MonoMarshalNative native;
-       MonoMarshalNative elem_type;
-       gint32 param_num;
-       gint32 num_elem;
+       union {
+               struct {
+                       MonoMarshalNative elem_type;
+                       gint32 param_num;
+                       gint32 num_elem;
+               } array_data;
+               struct {
+                       char *custom_name;
+                       char *cookie;
+               } custom_data;
+       } data;
 } MonoMarshalSpec;
 
+void         mono_metadata_init (void);
 
 void         mono_metadata_decode_row (MonoTableInfo         *t,
                                       int                    idx,
@@ -206,6 +217,7 @@ guint32     mono_metadata_properties_from_typedef (MonoImage *meta, guint32 tabl
 guint32     mono_metadata_methods_from_property   (MonoImage *meta, guint32 table_index, guint *end);
 guint32     mono_metadata_packing_from_typedef    (MonoImage *meta, guint32 table_index, guint32 *packing, guint32 *size);
 const char* mono_metadata_get_marshal_info        (MonoImage *meta, guint32 idx, gboolean is_field);
+guint32     mono_metadata_custom_attrs_from_index (MonoImage *meta, guint32 index);
 
 MonoMarshalSpec *mono_metadata_parse_marshal_spec (MonoImage *image, const char *ptr);
 
@@ -217,7 +229,7 @@ void        mono_metadata_field_info (MonoImage *meta,
                                      guint32      *rva,
                                      MonoMarshalSpec **marshal_spec);
 
-guint32     mono_metadata_get_constant_index (MonoImage *meta, guint32 token);
+guint32     mono_metadata_get_constant_index (MonoImage *meta, guint32 token, guint32 hint);
 
 /*
  * Functions to extract information from the Blobs
@@ -245,6 +257,7 @@ typedef struct {
 
 typedef struct _MonoType MonoType;
 typedef struct _MonoGenericInst MonoGenericInst;
+typedef struct _MonoGenericParam MonoGenericParam;
 typedef struct _MonoArrayType MonoArrayType;
 typedef struct _MonoMethodSignature MonoMethodSignature;
 
@@ -254,7 +267,7 @@ typedef struct {
 } MonoCustomMod;
 
 struct _MonoArrayType {
-       MonoType *type;
+       MonoClass *eklass;
        int rank;
        int numsizes;
        int numlobounds;
@@ -262,23 +275,14 @@ struct _MonoArrayType {
        int *lobounds;
 };
 
-/*
- * Generic instantiation data type encoding.
- */
-struct _MonoGenericInst {
-       MonoType *generic_type;
-       int type_argc;
-       MonoType **type_argv;
-};
-
 struct _MonoType {
        union {
                MonoClass *klass; /* for VALUETYPE and CLASS */
-               MonoType *type;   /* for PTR and SZARRAY */
+               MonoType *type;   /* for PTR */
                MonoArrayType *array; /* for ARRAY */
                MonoMethodSignature *method;
-               int type_param;
-               MonoGenericInst *generic_inst;
+               MonoGenericParam *generic_param; /* for VAR and MVAR */
+               MonoGenericInst *generic_inst; /* for GENERICINST */
        } data;
        unsigned int attrs    : 16; /* param attributes or field flags */
        unsigned int type     : 8;  /* ElementTypeEnum */
@@ -296,6 +300,7 @@ struct _MonoMethodSignature {
        unsigned int  ref_count : 23;
        guint16       param_count;
        guint16       sentinelpos;
+       guint16       generic_param_count;
        MonoType     *ret;
        MonoType     *params [MONO_ZERO_LEN_ARRAY];
 };
@@ -309,6 +314,8 @@ typedef struct {
        unsigned int init_locals : 1;
        guint16      num_locals;
        MonoExceptionClause *clauses;
+       MonoGenericParam *gen_params;
+       MonoGenericInst *geninst;
        MonoType    *locals [MONO_ZERO_LEN_ARRAY];
 } MonoMethodHeader;
 
@@ -354,8 +361,6 @@ int            mono_type_size                  (MonoType        *type,
                                                int             *alignment);
 int            mono_type_stack_size            (MonoType        *type, 
                                                int             *alignment);
-int            mono_type_native_stack_size     (MonoType        *type, 
-                                               int             *alignment);
 
 guint          mono_metadata_type_hash         (MonoType *t1);
 gboolean       mono_metadata_type_equal        (MonoType *t1, MonoType *t2);
@@ -383,14 +388,10 @@ guint32
 mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec, 
                        gboolean as_field, gboolean unicode, MonoMarshalConv *conv);
 
-gint32
-mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, gint32 *align, 
-                       gboolean as_field, gboolean unicode);
-
 /*
  * Makes a token based on a table and an index
  */
-#define mono_metadata_make_token(table,idx) (((table) << 24)| idx)
+#define mono_metadata_make_token(table,idx) (((table) << 24)| (idx))
 
 /*
  * Returns the table index that this token encodes.