include: Add some relocation types

André Hentschel nerv at dawncrow.de
Tue Nov 16 13:58:52 CST 2010


I was just digging into some relocation stuff (you can ask austin :)) and saw we are missing some defines.
---
 include/winnt.h |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/include/winnt.h b/include/winnt.h
index e6f9b3c..7d80bd2 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -3274,6 +3274,8 @@ typedef struct _IMAGE_RELOCATION
 #define	IMAGE_REL_I386_SEG12			9
 #define	IMAGE_REL_I386_SECTION			10
 #define	IMAGE_REL_I386_SECREL			11
+#define	IMAGE_REL_I386_TOKEN			12
+#define	IMAGE_REL_I386_SECREL7			13
 #define	IMAGE_REL_I386_REL32			20
 
 /* MIPS relocation types */
@@ -3289,6 +3291,7 @@ typedef struct _IMAGE_RELOCATION
 #define IMAGE_REL_MIPS_SECREL		0x000B
 #define IMAGE_REL_MIPS_SECRELLO		0x000C
 #define IMAGE_REL_MIPS_SECRELHI		0x000D
+#define IMAGE_REL_MIPS_TOKEN		0x000E
 #define	IMAGE_REL_MIPS_JMPADDR16	0x0010
 #define IMAGE_REL_MIPS_REFWORDNB	0x0022
 #define IMAGE_REL_MIPS_PAIR		0x0025
@@ -3342,6 +3345,7 @@ typedef struct _IMAGE_RELOCATION
 #define IMAGE_REL_PPC_SECRELLO          0x0013
 #define IMAGE_REL_PPC_SECRELHI          0x0014
 #define IMAGE_REL_PPC_GPREL		0x0015
+#define IMAGE_REL_PPC_TOKEN             0x0016
 #define IMAGE_REL_PPC_TYPEMASK          0x00FF
 /* modifier bits */
 #define IMAGE_REL_PPC_NEG               0x0100
@@ -3367,6 +3371,8 @@ typedef struct _IMAGE_RELOCATION
 #define IMAGE_REL_SH3_SECTION           0x000E
 #define IMAGE_REL_SH3_SECREL            0x000F
 #define IMAGE_REL_SH3_DIRECT32_NB       0x0010
+#define IMAGE_REL_SH3_GPREL4_LONG       0x0011
+#define IMAGE_REL_SH3_TOKEN             0x0012
 
 /* ARM (Archimedes?) relocation types */
 #define IMAGE_REL_ARM_ABSOLUTE		0x0000
@@ -3374,6 +3380,11 @@ typedef struct _IMAGE_RELOCATION
 #define IMAGE_REL_ARM_ADDR32NB		0x0002
 #define IMAGE_REL_ARM_BRANCH24		0x0003
 #define IMAGE_REL_ARM_BRANCH11		0x0004
+#define IMAGE_REL_ARM_TOKEN		0x0005
+#define IMAGE_REL_ARM_GPREL12		0x0006
+#define IMAGE_REL_ARM_GPREL7		0x0007
+#define IMAGE_REL_ARM_BLX24		0x0008
+#define IMAGE_REL_ARM_BLX11		0x0009
 #define IMAGE_REL_ARM_SECTION		0x000E
 #define IMAGE_REL_ARM_SECREL		0x000F
 
@@ -3395,12 +3406,18 @@ typedef struct _IMAGE_RELOCATION
 #define IMAGE_REL_IA64_SECREL		0x000E
 #define IMAGE_REL_IA64_LTOFF64		0x000F
 #define IMAGE_REL_IA64_DIR32NB		0x0010
-#define IMAGE_REL_IA64_RESERVED_11	0x0011
-#define IMAGE_REL_IA64_RESERVED_12	0x0012
-#define IMAGE_REL_IA64_RESERVED_13	0x0013
-#define IMAGE_REL_IA64_RESERVED_14	0x0014
-#define IMAGE_REL_IA64_RESERVED_15	0x0015
-#define IMAGE_REL_IA64_RESERVED_16	0x0016
+#define IMAGE_REL_IA64_SREL14		0x0011
+#define IMAGE_REL_IA64_SREL22		0x0012
+#define IMAGE_REL_IA64_SREL32		0x0013
+#define IMAGE_REL_IA64_UREL32		0x0014
+#define IMAGE_REL_IA64_PCREL60X	0x0015
+#define IMAGE_REL_IA64_PCREL60B	0x0016
+#define IMAGE_REL_IA64_PCREL60F	0x0017
+#define IMAGE_REL_IA64_PCREL60I	0x0018
+#define IMAGE_REL_IA64_PCREL60M	0x0019
+#define IMAGE_REL_IA64_IMMGPREL64	0x001A
+#define IMAGE_REL_IA64_TOKEN		0x001B
+#define IMAGE_REL_IA64_GPREL32		0x001C
 #define IMAGE_REL_IA64_ADDEND		0x001F
 
 /* AMD64 relocation types */
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list