#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)))
+#define MONO_CLASS_IS_INTERFACE(c) ((c->flags & TYPE_ATTRIBUTE_INTERFACE) || (c->byval_arg.type == MONO_TYPE_VAR) || (c->byval_arg.type == MONO_TYPE_MVAR))
typedef struct _MonoClass MonoClass;
typedef struct _MonoDomain MonoDomain;
MONO_TABLE_MODULE,
MONO_TABLE_TYPEREF,
MONO_TABLE_TYPEDEF,
- MONO_TABLE_UNUSED1,
+ MONO_TABLE_FIELD_POINTER,
MONO_TABLE_FIELD,
- MONO_TABLE_UNUSED2,
+ MONO_TABLE_METHOD_POINTER,
MONO_TABLE_METHOD,
- MONO_TABLE_UNUSED3,
+ MONO_TABLE_PARAM_POINTER,
MONO_TABLE_PARAM,
MONO_TABLE_INTERFACEIMPL,
MONO_TABLE_MEMBERREF, /* 0xa */
MONO_TABLE_FIELDLAYOUT, /* 0x10 */
MONO_TABLE_STANDALONESIG,
MONO_TABLE_EVENTMAP,
- MONO_TABLE_UNUSED4,
+ MONO_TABLE_EVENT_POINTER,
MONO_TABLE_EVENT,
MONO_TABLE_PROPERTYMAP,
MONO_TABLE_UNUSED5,
MONO_MARSHAL_CONV_STR_BYVALSTR,
MONO_MARSHAL_CONV_STR_BYVALWSTR,
MONO_MARSHAL_CONV_SB_LPSTR,
+ MONO_MARSHAL_CONV_SB_LPTSTR,
+ MONO_MARSHAL_CONV_SB_LPWSTR,
MONO_MARSHAL_CONV_LPSTR_SB,
+ MONO_MARSHAL_CONV_LPTSTR_SB,
+ MONO_MARSHAL_CONV_LPWSTR_SB,
MONO_MARSHAL_CONV_ARRAY_BYVALARRAY,
MONO_MARSHAL_CONV_ARRAY_SAVEARRAY,
MONO_MARSHAL_CONV_ARRAY_LPARRAY,
MONO_MARSHAL_CONV_OBJECT_IUNKNOWN,
MONO_MARSHAL_CONV_OBJECT_STRUCT,
MONO_MARSHAL_CONV_DEL_FTN,
+ MONO_MARSHAL_CONV_FTN_DEL,
MONO_MARSHAL_CONV_STRARRAY_STRLPARRAY,
- MONO_MARSHAL_FREE_ARRAY
+ MONO_MARSHAL_CONV_STRARRAY_STRWLPARRAY,
+ MONO_MARSHAL_CONV_ASANY,
+ MONO_MARSHAL_FREE_ARRAY,
+ MONO_MARSHAL_FREE_ASANY
} MonoMarshalConv;
typedef struct {
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
typedef struct _MonoType MonoType;
typedef struct _MonoGenericInst MonoGenericInst;
+typedef struct _MonoDynamicGenericInst MonoDynamicGenericInst;
+typedef struct _MonoGenericMethod MonoGenericMethod;
+typedef struct _MonoGenericContext MonoGenericContext;
typedef struct _MonoGenericParam MonoGenericParam;
typedef struct _MonoArrayType MonoArrayType;
typedef struct _MonoMethodSignature MonoMethodSignature;
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 */
unsigned int ref_count : 23;
guint16 param_count;
guint16 sentinelpos;
+ unsigned int generic_param_count : 30;
+ unsigned int is_inflated : 1;
+ unsigned int has_type_parameters : 1;
MonoType *ret;
MonoType *params [MONO_ZERO_LEN_ARRAY];
};
unsigned int init_locals : 1;
guint16 num_locals;
MonoExceptionClause *clauses;
+ MonoGenericParam *gen_params;
MonoType *locals [MONO_ZERO_LEN_ARRAY];
} MonoMethodHeader;
MONO_PARSE_FIELD
} MonoParseTypeMode;
-struct _MonoGenericParam {
- MonoClass *klass;
- const char *name;
- guint16 flags;
- guint16 num;
- MonoClass** constraints; /* NULL means end of list */
-};
-
guint32 mono_metadata_parse_typedef_or_ref (MonoImage *m,
const char *ptr,
const char **rptr);
int mono_type_stack_size (MonoType *type,
int *alignment);
+guint mono_metadata_generic_inst_hash (MonoGenericInst *ginst);
+gboolean mono_metadata_generic_inst_equal (MonoGenericInst *g1, MonoGenericInst *g2);
+
guint mono_metadata_type_hash (MonoType *t1);
gboolean mono_metadata_type_equal (MonoType *t1, MonoType *t2);
MonoMethodSignature *mono_metadata_signature_alloc (MonoImage *image, guint32 nparams);
+MonoMethodSignature *mono_metadata_signature_dup (MonoMethodSignature *sig);
+
MonoMethodSignature *mono_metadata_parse_signature (MonoImage *image,
guint32 token);
/*
* 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.
char *mono_guid_to_string (const guint8 *guid);
-MonoGenericParam *mono_metadata_load_generic_params (MonoImage *image, guint32 token, guint32 *num);
-
#endif /* __MONO_METADATA_H__ */