#define MONO_ZERO_LEN_ARRAY 1
#endif
-#define MONO_TYPE_ISSTRUCT(t) (!(t)->byref && (((t)->type == MONO_TYPE_VALUETYPE && !(t)->data.klass->enumtype) || ((t)->type == MONO_TYPE_TYPEDBYREF)))
+#define MONO_TYPE_ISSTRUCT(t) (!(t)->byref && (((t)->type == MONO_TYPE_VALUETYPE && !(t)->data.klass->enumtype) || ((t)->type == MONO_TYPE_TYPEDBYREF) || (((t)->type == MONO_TYPE_GENERICINST) && mono_metadata_generic_class_is_valuetype ((t)->data.generic_class))))
#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_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)) || \
+ (((t)->type == MONO_TYPE_GENERICINST) && \
+ !mono_metadata_generic_class_is_valuetype ((t)->data.generic_class))))
+
#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;
MONO_MARSHAL_CONV_OBJECT_STRUCT,
MONO_MARSHAL_CONV_DEL_FTN,
MONO_MARSHAL_CONV_FTN_DEL,
- MONO_MARSHAL_CONV_STRARRAY_STRLPARRAY,
- MONO_MARSHAL_CONV_STRARRAY_STRWLPARRAY,
- MONO_MARSHAL_CONV_ASANY,
- MONO_MARSHAL_FREE_ARRAY,
- MONO_MARSHAL_FREE_ASANY
+ MONO_MARSHAL_FREE_ARRAY
} MonoMarshalConv;
typedef struct {
void mono_metadata_init (void);
-void mono_metadata_decode_row (MonoTableInfo *t,
+void mono_metadata_decode_row (const MonoTableInfo *t,
int idx,
guint32 *res,
int res_size);
-guint32 mono_metadata_decode_row_col (MonoTableInfo *t,
+guint32 mono_metadata_decode_row_col (const MonoTableInfo *t,
int idx,
guint col);
MonoMarshalSpec *mono_metadata_parse_marshal_spec (MonoImage *image, const char *ptr);
+void mono_metadata_free_marshal_spec (MonoMarshalSpec *spec);
+
guint32 mono_metadata_implmap_from_method (MonoImage *meta, guint32 method_idx);
void mono_metadata_field_info (MonoImage *meta,
guint32 try_len;
guint32 handler_offset;
guint32 handler_len;
- guint32 token_or_filter;
+ union {
+ guint32 filter_offset;
+ MonoClass *catch_class;
+ } data;
} MonoExceptionClause;
typedef struct _MonoType MonoType;
typedef struct _MonoGenericInst MonoGenericInst;
-typedef struct _MonoDynamicGenericInst MonoDynamicGenericInst;
+typedef struct _MonoGenericClass MonoGenericClass;
+typedef struct _MonoDynamicGenericClass MonoDynamicGenericClass;
typedef struct _MonoGenericMethod MonoGenericMethod;
typedef struct _MonoGenericContext MonoGenericContext;
+typedef struct _MonoGenericContainer MonoGenericContainer;
typedef struct _MonoGenericParam MonoGenericParam;
typedef struct _MonoArrayType MonoArrayType;
typedef struct _MonoMethodSignature MonoMethodSignature;
MonoArrayType *array; /* for ARRAY */
MonoMethodSignature *method;
MonoGenericParam *generic_param; /* for VAR and MVAR */
- MonoGenericInst *generic_inst; /* for GENERICINST */
+ MonoGenericClass *generic_class; /* for GENERICINST */
} data;
unsigned int attrs : 16; /* param attributes or field flags */
unsigned int type : 8; /* ElementTypeEnum */
unsigned int init_locals : 1;
guint16 num_locals;
MonoExceptionClause *clauses;
- MonoGenericParam *gen_params;
MonoType *locals [MONO_ZERO_LEN_ARRAY];
} MonoMethodHeader;
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);
+gboolean mono_metadata_generic_class_is_valuetype (MonoGenericClass *gclass);
+guint mono_metadata_generic_class_hash (MonoGenericClass *gclass);
+gboolean mono_metadata_generic_class_equal (MonoGenericClass *g1, MonoGenericClass *g2);
guint mono_metadata_type_hash (MonoType *t1);
gboolean mono_metadata_type_equal (MonoType *t1, MonoType *t2);
char *mono_guid_to_string (const guint8 *guid);
+guint32 mono_metadata_declsec_from_index (MonoImage *meta, guint32 idx);
+
#endif /* __MONO_METADATA_H__ */