Merge pull request #5714 from alexischr/update_bockbuild

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

diff --git a/mono/metadata/cil-coff.h b/mono/metadata/cil-coff.h
index a68043e73e42087353f14679ed02b03dbde6b499..d6e966ee83c70acc576c5806cc8e26eb77b663b1 100644 (file)
--- a/mono/metadata/cil-coff.h
+++ b/mono/metadata/cil-coff.h
@@ -1,15 +1,18 @@
+/**
+ * \file
+ */
 
 #ifndef __MONO_CIL_COFF_H__
 #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
 
 /*
@@ -37,6 +40,12 @@ typedef struct {
        char    msdos_header2 [64];
 } MonoMSDOSHeader;
 
+/* Possible values for coff_machine */
+#define COFF_MACHINE_I386 332
+#define COFF_MACHINE_IA64 512
+#define COFF_MACHINE_AMD64 34404
+#define COFF_MACHINE_ARM 452
+
 /* 20 bytes */
 typedef struct {
        guint16  coff_machine;
@@ -153,33 +162,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;
@@ -293,6 +299,7 @@ typedef struct {
 #define CLI_FLAGS_32BITREQUIRED  0x02
 #define CLI_FLAGS_STRONGNAMESIGNED 0x8
 #define CLI_FLAGS_TRACKDEBUGDATA 0x00010000
+#define CLI_FLAGS_PREFERRED32BIT 0x00020000
        guint32        ch_flags;
 
        guint32        ch_entry_point;
@@ -323,6 +330,6 @@ typedef struct {
        MonoCLIHeader     cli_cli_header;
 } MonoCLIImageInfo;
 
-guint32       mono_cli_rva_image_map (MonoImage *image, guint32 rva);
+MONO_API guint32       mono_cli_rva_image_map (MonoImage *image, guint32 rva);
 
 #endif /* __MONO_CIL_COFF_H__ */