Add regression test for #691057

[mono.git] / mono / metadata / cil-coff.h

diff --git a/mono/metadata/cil-coff.h b/mono/metadata/cil-coff.h
index a68043e73e42087353f14679ed02b03dbde6b499..91ede875aad5d2380ae75c6a422ec7937b8b09eb 100644 (file)
--- a/mono/metadata/cil-coff.h
+++ b/mono/metadata/cil-coff.h
@@ -3,13 +3,13 @@
 #define __MONO_CIL_COFF_H__
 
 #include <mono/metadata/metadata.h>
+#include <glib.h>
 
 /*
  * 25.2.1: Method header type values
  */
-#define METHOD_HEADER_FORMAT_MASK   7
+#define METHOD_HEADER_FORMAT_MASK   3
 #define METHOD_HEADER_TINY_FORMAT   2
-#define METHOD_HEADER_TINY_FORMAT1  6
 #define METHOD_HEADER_FAT_FORMAT    3
 
 /*
@@ -153,33 +153,30 @@ typedef struct {
 #define MONO_PE_RESOURCE_ID_ANICURSOR  0x15
 #define MONO_PE_RESOURCE_ID_ANIICON    0x16
 #define MONO_PE_RESOURCE_ID_HTML       0x17
+#define MONO_PE_RESOURCE_ID_ASPNET_STRING      0x65
 
 typedef struct {
        /* If the MSB is set, then the other 31 bits store the RVA of
         * the unicode string containing the name.  Otherwise, the
         * other 31 bits contain the ID of this entry.
         */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-       guint32 name_offset:31;
-       guint32 name_is_string:1;
-#else
-       guint32 name_is_string:1;
-       guint32 name_offset:31;
-#endif
-       
+       guint32 name;
+
        /* If the MSB is set, then the other 31 bits store the RVA of
         * another subdirectory.  Otherwise, the other 31 bits store
         * the RVA of the resource data entry leaf node.
         */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-       guint32 dir_offset:31;
-       guint32 is_dir:1;
-#else
-       guint32 is_dir:1;
-       guint32 dir_offset:31;
-#endif
+       guint32 dir;
 } MonoPEResourceDirEntry;
 
+#define MONO_PE_RES_DIR_ENTRY_NAME_IS_STRING(d)        (GUINT32_FROM_LE((d).name) >> 31)
+#define MONO_PE_RES_DIR_ENTRY_NAME_OFFSET(d)   (GUINT32_FROM_LE((d).name) & 0x7fffffff)
+#define MONO_PE_RES_DIR_ENTRY_SET_NAME(d,i,o)  ((d).name = GUINT32_TO_LE(((guint32)((i)?1:0) << 31) | ((o) & 0x7fffffff)))
+
+#define MONO_PE_RES_DIR_ENTRY_IS_DIR(d)                (GUINT32_FROM_LE((d).dir) >> 31)
+#define MONO_PE_RES_DIR_ENTRY_DIR_OFFSET(d)    (GUINT32_FROM_LE((d).dir) & 0x7fffffff)
+#define MONO_PE_RES_DIR_ENTRY_SET_DIR(d,i,o)   ((d).dir = GUINT32_TO_LE(((guint32)((i)?1:0) << 31) | ((o) & 0x7fffffff)))
+
 typedef struct 
 {
        guint32 res_characteristics;