X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fblob.h;h=3d0e3ab31389b3bacea4e1cff3c039119a7b8a52;hb=036d915f04e05dedfe6f3a8ea636a90d24451538;hp=9bf4a278368bafcddab8c40d08727e055c909ec5;hpb=e8d4a08a2452ff7a042c869762ce1d65028483a5;p=mono.git

diff --git a/mono/metadata/blob.h b/mono/metadata/blob.h
index 9bf4a278368..3d0e3ab3138 100644
--- a/mono/metadata/blob.h
+++ b/mono/metadata/blob.h
@@ -5,10 +5,6 @@
 #ifndef _MONO_METADATA_BLOB_H_
 #define _MONO_METADATA_BLOB_H_
 
-#define SIGNATURE_HAS_THIS      0x20
-#define SIGNATURE_EXPLICIT_THIS 0x40
-#define SIGNATURE_VARARG        0x05
-
 /*
  * Encoding for type signatures used in the Metadata
  */
@@ -32,13 +28,16 @@ typedef enum {
 	MONO_TYPE_BYREF      = 0x10,       /* arg: <type> token */
 	MONO_TYPE_VALUETYPE  = 0x11,       /* arg: <type> token */
 	MONO_TYPE_CLASS      = 0x12,       /* arg: <type> token */
+	MONO_TYPE_VAR	     = 0x13,	   /* number */
 	MONO_TYPE_ARRAY      = 0x14,       /* type, rank, boundsCount, bound1, loCount, lo1 */
-	MONO_TYPE_TYPEDBYREF = 0x15,
+	MONO_TYPE_GENERICINST= 0x15,	   /* <type> <type-arg-count> <type-1> \x{2026} <type-n> */
+	MONO_TYPE_TYPEDBYREF = 0x16,
 	MONO_TYPE_I          = 0x18,
 	MONO_TYPE_U          = 0x19,
 	MONO_TYPE_FNPTR      = 0x1b,	      /* arg: full method signature */
 	MONO_TYPE_OBJECT     = 0x1c,
 	MONO_TYPE_SZARRAY    = 0x1d,       /* 0-based one-dim-array */
+	MONO_TYPE_MVAR	     = 0x1e,       /* number */
 	MONO_TYPE_CMOD_REQD  = 0x1f,       /* arg: typedef or typeref token */
 	MONO_TYPE_CMOD_OPT   = 0x20,       /* optional arg: typedef or typref token */
 	MONO_TYPE_INTERNAL   = 0x21,       /* CLR internal type */
@@ -46,6 +45,61 @@ typedef enum {
 	MONO_TYPE_MODIFIER   = 0x40,       /* Or with the following types */
 	MONO_TYPE_SENTINEL   = 0x41,       /* Sentinel for varargs method signature */
 	MONO_TYPE_PINNED     = 0x45,       /* Local var that points to pinned object */
+
+	MONO_TYPE_ENUM       = 0x55        /* an enumeration */
 } MonoTypeEnum;
 
+typedef enum {
+	MONO_TABLE_MODULE,
+	MONO_TABLE_TYPEREF,
+	MONO_TABLE_TYPEDEF,
+	MONO_TABLE_FIELD_POINTER,
+	MONO_TABLE_FIELD,
+	MONO_TABLE_METHOD_POINTER,
+	MONO_TABLE_METHOD,
+	MONO_TABLE_PARAM_POINTER,
+	MONO_TABLE_PARAM,
+	MONO_TABLE_INTERFACEIMPL,
+	MONO_TABLE_MEMBERREF, /* 0xa */
+	MONO_TABLE_CONSTANT,
+	MONO_TABLE_CUSTOMATTRIBUTE,
+	MONO_TABLE_FIELDMARSHAL,
+	MONO_TABLE_DECLSECURITY,
+	MONO_TABLE_CLASSLAYOUT,
+	MONO_TABLE_FIELDLAYOUT, /* 0x10 */
+	MONO_TABLE_STANDALONESIG,
+	MONO_TABLE_EVENTMAP,
+	MONO_TABLE_EVENT_POINTER,
+	MONO_TABLE_EVENT,
+	MONO_TABLE_PROPERTYMAP,
+	MONO_TABLE_PROPERTY_POINTER,
+	MONO_TABLE_PROPERTY,
+	MONO_TABLE_METHODSEMANTICS,
+	MONO_TABLE_METHODIMPL,
+	MONO_TABLE_MODULEREF, /* 0x1a */
+	MONO_TABLE_TYPESPEC,
+	MONO_TABLE_IMPLMAP,
+	MONO_TABLE_FIELDRVA,
+	MONO_TABLE_UNUSED6,
+	MONO_TABLE_UNUSED7,
+	MONO_TABLE_ASSEMBLY, /* 0x20 */
+	MONO_TABLE_ASSEMBLYPROCESSOR,
+	MONO_TABLE_ASSEMBLYOS,
+	MONO_TABLE_ASSEMBLYREF,
+	MONO_TABLE_ASSEMBLYREFPROCESSOR,
+	MONO_TABLE_ASSEMBLYREFOS,
+	MONO_TABLE_FILE,
+	MONO_TABLE_EXPORTEDTYPE,
+	MONO_TABLE_MANIFESTRESOURCE,
+	MONO_TABLE_NESTEDCLASS,
+	MONO_TABLE_GENERICPARAM, /* 0x2a */
+	MONO_TABLE_METHODSPEC,
+	MONO_TABLE_GENERICPARAMCONSTRAINT
+
+#define MONO_TABLE_LAST MONO_TABLE_GENERICPARAMCONSTRAINT
+#define MONO_TABLE_NUM (MONO_TABLE_LAST + 1)
+
+} MonoMetaTableEnum;
+
 #endif
+