Commit 885705205502e9b9668aa7c38daf54ea1ab0a072

Authored by bellard
1 parent ce11fedc

more cpu support


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@77 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 708 additions and 101 deletions
1   -/*
2   - * ELF register definitions..
3   - */
  1 +#ifndef _ELF_H
  2 +#define _ELF_H
4 3  
5 4 #include <inttypes.h>
6 5  
7   -typedef uint32_t elf_greg_t;
8   -
9   -#define ELF_NGREG (sizeof (struct target_pt_regs) / sizeof(elf_greg_t))
10   -typedef elf_greg_t elf_gregset_t[ELF_NGREG];
11   -
12   -typedef struct user_i387_struct elf_fpregset_t;
13   -
14   -/*
15   - * This is used to ensure we don't load something for the wrong architecture.
16   - */
17   -#define elf_check_arch(x) ( ((x) == EM_386) || ((x) == EM_486) )
18   -
19   -/*
20   - * These are used to set parameters in the core dumps.
21   - */
22   -#define ELF_CLASS ELFCLASS32
23   -#define ELF_DATA ELFDATA2LSB;
24   -#define ELF_ARCH EM_386
25   -
26   - /* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program
27   - starts %edx contains a pointer to a function which might be
28   - registered using `atexit'. This provides a mean for the
29   - dynamic linker to call DT_FINI functions for shared libraries
30   - that have been loaded before the code runs.
31   -
32   - A value of 0 tells we have no such handler. */
33   -#define ELF_PLAT_INIT(_r) _r->edx = 0
34   -
35   -#define USE_ELF_CORE_DUMP
36   -#define ELF_EXEC_PAGESIZE 4096
37   -
38   -
39   -typedef uint32_t Elf32_Addr;
  6 +/* 32-bit ELF base types. */
  7 +typedef uint32_t Elf32_Addr;
40 8 typedef uint16_t Elf32_Half;
41 9 typedef uint32_t Elf32_Off;
42 10 typedef int32_t Elf32_Sword;
43 11 typedef uint32_t Elf32_Word;
44 12  
  13 +/* 64-bit ELF base types. */
  14 +typedef uint64_t Elf64_Addr;
  15 +typedef uint16_t Elf64_Half;
  16 +typedef int16_t Elf64_SHalf;
  17 +typedef uint64_t Elf64_Off;
  18 +typedef int32_t Elf64_Sword;
  19 +typedef uint32_t Elf64_Word;
  20 +typedef uint64_t Elf64_Xword;
  21 +typedef int64_t Elf64_Sxword;
  22 +
45 23 /* These constants are for the segment types stored in the image headers */
46 24 #define PT_NULL 0
47 25 #define PT_LOAD 1
... ... @@ -52,6 +30,13 @@ typedef uint32_t Elf32_Word;
52 30 #define PT_PHDR 6
53 31 #define PT_LOPROC 0x70000000
54 32 #define PT_HIPROC 0x7fffffff
  33 +#define PT_MIPS_REGINFO 0x70000000
  34 +
  35 +/* Flags in the e_flags field of the header */
  36 +#define EF_MIPS_NOREORDER 0x00000001
  37 +#define EF_MIPS_PIC 0x00000002
  38 +#define EF_MIPS_CPIC 0x00000004
  39 +#define EF_MIPS_ARCH 0xf0000000
55 40  
56 41 /* These constants define the different elf file types */
57 42 #define ET_NONE 0
... ... @@ -59,8 +44,8 @@ typedef uint32_t Elf32_Word;
59 44 #define ET_EXEC 2
60 45 #define ET_DYN 3
61 46 #define ET_CORE 4
62   -#define ET_LOPROC 5
63   -#define ET_HIPROC 6
  47 +#define ET_LOPROC 0xff00
  48 +#define ET_HIPROC 0xffff
64 49  
65 50 /* These constants define the various ELF target machines */
66 51 #define EM_NONE 0
... ... @@ -76,13 +61,31 @@ typedef uint32_t Elf32_Word;
76 61  
77 62 #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
78 63  
79   -#define EM_SPARC64 11 /* SPARC v9 (not official) 64-bit */
80   -
81 64 #define EM_PARISC 15 /* HPPA */
82 65  
83 66 #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
84 67  
85 68 #define EM_PPC 20 /* PowerPC */
  69 +#define EM_PPC64 21 /* PowerPC64 */
  70 +
  71 +#define EM_ARM 40 /* ARM */
  72 +
  73 +#define EM_SH 42 /* SuperH */
  74 +
  75 +#define EM_SPARCV9 43 /* SPARC v9 64-bit */
  76 +
  77 +#define EM_IA_64 50 /* HP/Intel IA-64 */
  78 +
  79 +#define EM_X86_64 62 /* AMD x86-64 */
  80 +
  81 +#define EM_S390 22 /* IBM S/390 */
  82 +
  83 +#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
  84 +
  85 +#define EM_V850 87 /* NEC v850 */
  86 +
  87 +#define EM_H8_300H 47 /* Hitachi H8/300H */
  88 +#define EM_H8S 48 /* Hitachi H8S */
86 89  
87 90 /*
88 91 * This is an interim value that we will use until the committee comes
... ... @@ -90,6 +93,13 @@ typedef uint32_t Elf32_Word;
90 93 */
91 94 #define EM_ALPHA 0x9026
92 95  
  96 +/* Bogus old v850 magic number, used by old tools. */
  97 +#define EM_CYGNUS_V850 0x9080
  98 +
  99 +/*
  100 + * This is the old interim value for S/390 architecture
  101 + */
  102 +#define EM_S390_OLD 0xA390
93 103  
94 104 /* This is the info that is needed to parse the dynamic section of the file */
95 105 #define DT_NULL 0
... ... @@ -118,6 +128,25 @@ typedef uint32_t Elf32_Word;
118 128 #define DT_JMPREL 23
119 129 #define DT_LOPROC 0x70000000
120 130 #define DT_HIPROC 0x7fffffff
  131 +#define DT_MIPS_RLD_VERSION 0x70000001
  132 +#define DT_MIPS_TIME_STAMP 0x70000002
  133 +#define DT_MIPS_ICHECKSUM 0x70000003
  134 +#define DT_MIPS_IVERSION 0x70000004
  135 +#define DT_MIPS_FLAGS 0x70000005
  136 + #define RHF_NONE 0
  137 + #define RHF_HARDWAY 1
  138 + #define RHF_NOTPOT 2
  139 +#define DT_MIPS_BASE_ADDRESS 0x70000006
  140 +#define DT_MIPS_CONFLICT 0x70000008
  141 +#define DT_MIPS_LIBLIST 0x70000009
  142 +#define DT_MIPS_LOCAL_GOTNO 0x7000000a
  143 +#define DT_MIPS_CONFLICTNO 0x7000000b
  144 +#define DT_MIPS_LIBLISTNO 0x70000010
  145 +#define DT_MIPS_SYMTABNO 0x70000011
  146 +#define DT_MIPS_UNREFEXTNO 0x70000012
  147 +#define DT_MIPS_GOTSYM 0x70000013
  148 +#define DT_MIPS_HIPAGENO 0x70000014
  149 +#define DT_MIPS_RLD_MAP 0x70000016
121 150  
122 151 /* This info is needed when parsing the symbol table */
123 152 #define STB_LOCAL 0
... ... @@ -130,8 +159,12 @@ typedef uint32_t Elf32_Word;
130 159 #define STT_SECTION 3
131 160 #define STT_FILE 4
132 161  
133   -#define ELF32_ST_BIND(x) ((x) >> 4)
134   -#define ELF32_ST_TYPE(x) (((unsigned int) x) & 0xf)
  162 +#define ELF_ST_BIND(x) ((x) >> 4)
  163 +#define ELF_ST_TYPE(x) (((unsigned int) x) & 0xf)
  164 +#define ELF32_ST_BIND(x) ELF_ST_BIND(x)
  165 +#define ELF32_ST_TYPE(x) ELF_ST_TYPE(x)
  166 +#define ELF64_ST_BIND(x) ELF_ST_BIND(x)
  167 +#define ELF64_ST_TYPE(x) ELF_ST_TYPE(x)
135 168  
136 169 /* Symbolic values for the entries in the auxiliary table
137 170 put on the initial stack */
... ... @@ -150,7 +183,9 @@ typedef uint32_t Elf32_Word;
150 183 #define AT_EUID 12 /* effective uid */
151 184 #define AT_GID 13 /* real gid */
152 185 #define AT_EGID 14 /* effective gid */
153   -
  186 +#define AT_PLATFORM 15 /* string identifying CPU for optimizations */
  187 +#define AT_HWCAP 16 /* arch dependent hints at CPU capabilities */
  188 +#define AT_CLKTCK 17 /* frequency at which times() increments */
154 189  
155 190 typedef struct dynamic{
156 191 Elf32_Sword d_tag;
... ... @@ -161,10 +196,10 @@ typedef struct dynamic{
161 196 } Elf32_Dyn;
162 197  
163 198 typedef struct {
164   - unsigned long long d_tag; /* entry tag value */
  199 + Elf64_Sxword d_tag; /* entry tag value */
165 200 union {
166   - unsigned long long d_val;
167   - unsigned long long d_ptr;
  201 + Elf64_Xword d_val;
  202 + Elf64_Addr d_ptr;
168 203 } d_un;
169 204 } Elf64_Dyn;
170 205  
... ... @@ -172,6 +207,9 @@ typedef struct {
172 207 #define ELF32_R_SYM(x) ((x) >> 8)
173 208 #define ELF32_R_TYPE(x) ((x) & 0xff)
174 209  
  210 +#define ELF64_R_SYM(i) ((i) >> 32)
  211 +#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
  212 +
175 213 #define R_386_NONE 0
176 214 #define R_386_32 1
177 215 #define R_386_PC32 2
... ... @@ -185,14 +223,559 @@ typedef struct {
185 223 #define R_386_GOTPC 10
186 224 #define R_386_NUM 11
187 225  
  226 +#define R_MIPS_NONE 0
  227 +#define R_MIPS_16 1
  228 +#define R_MIPS_32 2
  229 +#define R_MIPS_REL32 3
  230 +#define R_MIPS_26 4
  231 +#define R_MIPS_HI16 5
  232 +#define R_MIPS_LO16 6
  233 +#define R_MIPS_GPREL16 7
  234 +#define R_MIPS_LITERAL 8
  235 +#define R_MIPS_GOT16 9
  236 +#define R_MIPS_PC16 10
  237 +#define R_MIPS_CALL16 11
  238 +#define R_MIPS_GPREL32 12
  239 +/* The remaining relocs are defined on Irix, although they are not
  240 + in the MIPS ELF ABI. */
  241 +#define R_MIPS_UNUSED1 13
  242 +#define R_MIPS_UNUSED2 14
  243 +#define R_MIPS_UNUSED3 15
  244 +#define R_MIPS_SHIFT5 16
  245 +#define R_MIPS_SHIFT6 17
  246 +#define R_MIPS_64 18
  247 +#define R_MIPS_GOT_DISP 19
  248 +#define R_MIPS_GOT_PAGE 20
  249 +#define R_MIPS_GOT_OFST 21
  250 +/*
  251 + * The following two relocation types are specified in the MIPS ABI
  252 + * conformance guide version 1.2 but not yet in the psABI.
  253 + */
  254 +#define R_MIPS_GOTHI16 22
  255 +#define R_MIPS_GOTLO16 23
  256 +#define R_MIPS_SUB 24
  257 +#define R_MIPS_INSERT_A 25
  258 +#define R_MIPS_INSERT_B 26
  259 +#define R_MIPS_DELETE 27
  260 +#define R_MIPS_HIGHER 28
  261 +#define R_MIPS_HIGHEST 29
  262 +/*
  263 + * The following two relocation types are specified in the MIPS ABI
  264 + * conformance guide version 1.2 but not yet in the psABI.
  265 + */
  266 +#define R_MIPS_CALLHI16 30
  267 +#define R_MIPS_CALLLO16 31
  268 +/*
  269 + * This range is reserved for vendor specific relocations.
  270 + */
  271 +#define R_MIPS_LOVENDOR 100
  272 +#define R_MIPS_HIVENDOR 127
  273 +
  274 +
  275 +/*
  276 + * Sparc ELF relocation types
  277 + */
  278 +#define R_SPARC_NONE 0
  279 +#define R_SPARC_8 1
  280 +#define R_SPARC_16 2
  281 +#define R_SPARC_32 3
  282 +#define R_SPARC_DISP8 4
  283 +#define R_SPARC_DISP16 5
  284 +#define R_SPARC_DISP32 6
  285 +#define R_SPARC_WDISP30 7
  286 +#define R_SPARC_WDISP22 8
  287 +#define R_SPARC_HI22 9
  288 +#define R_SPARC_22 10
  289 +#define R_SPARC_13 11
  290 +#define R_SPARC_LO10 12
  291 +#define R_SPARC_GOT10 13
  292 +#define R_SPARC_GOT13 14
  293 +#define R_SPARC_GOT22 15
  294 +#define R_SPARC_PC10 16
  295 +#define R_SPARC_PC22 17
  296 +#define R_SPARC_WPLT30 18
  297 +#define R_SPARC_COPY 19
  298 +#define R_SPARC_GLOB_DAT 20
  299 +#define R_SPARC_JMP_SLOT 21
  300 +#define R_SPARC_RELATIVE 22
  301 +#define R_SPARC_UA32 23
  302 +#define R_SPARC_PLT32 24
  303 +#define R_SPARC_HIPLT22 25
  304 +#define R_SPARC_LOPLT10 26
  305 +#define R_SPARC_PCPLT32 27
  306 +#define R_SPARC_PCPLT22 28
  307 +#define R_SPARC_PCPLT10 29
  308 +#define R_SPARC_10 30
  309 +#define R_SPARC_11 31
  310 +#define R_SPARC_64 32
  311 +#define R_SPARC_WDISP16 40
  312 +#define R_SPARC_WDISP19 41
  313 +#define R_SPARC_7 43
  314 +#define R_SPARC_5 44
  315 +#define R_SPARC_6 45
  316 +
  317 +/* Bits present in AT_HWCAP, primarily for Sparc32. */
  318 +
  319 +#define HWCAP_SPARC_FLUSH 1 /* CPU supports flush instruction. */
  320 +#define HWCAP_SPARC_STBAR 2
  321 +#define HWCAP_SPARC_SWAP 4
  322 +#define HWCAP_SPARC_MULDIV 8
  323 +#define HWCAP_SPARC_V9 16
  324 +#define HWCAP_SPARC_ULTRA3 32
  325 +
  326 +/*
  327 + * 68k ELF relocation types
  328 + */
  329 +#define R_68K_NONE 0
  330 +#define R_68K_32 1
  331 +#define R_68K_16 2
  332 +#define R_68K_8 3
  333 +#define R_68K_PC32 4
  334 +#define R_68K_PC16 5
  335 +#define R_68K_PC8 6
  336 +#define R_68K_GOT32 7
  337 +#define R_68K_GOT16 8
  338 +#define R_68K_GOT8 9
  339 +#define R_68K_GOT32O 10
  340 +#define R_68K_GOT16O 11
  341 +#define R_68K_GOT8O 12
  342 +#define R_68K_PLT32 13
  343 +#define R_68K_PLT16 14
  344 +#define R_68K_PLT8 15
  345 +#define R_68K_PLT32O 16
  346 +#define R_68K_PLT16O 17
  347 +#define R_68K_PLT8O 18
  348 +#define R_68K_COPY 19
  349 +#define R_68K_GLOB_DAT 20
  350 +#define R_68K_JMP_SLOT 21
  351 +#define R_68K_RELATIVE 22
  352 +
  353 +/*
  354 + * Alpha ELF relocation types
  355 + */
  356 +#define R_ALPHA_NONE 0 /* No reloc */
  357 +#define R_ALPHA_REFLONG 1 /* Direct 32 bit */
  358 +#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */
  359 +#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */
  360 +#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */
  361 +#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */
  362 +#define R_ALPHA_GPDISP 6 /* Add displacement to GP */
  363 +#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */
  364 +#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */
  365 +#define R_ALPHA_SREL16 9 /* PC relative 16 bit */
  366 +#define R_ALPHA_SREL32 10 /* PC relative 32 bit */
  367 +#define R_ALPHA_SREL64 11 /* PC relative 64 bit */
  368 +#define R_ALPHA_GPRELHIGH 17 /* GP relative 32 bit, high 16 bits */
  369 +#define R_ALPHA_GPRELLOW 18 /* GP relative 32 bit, low 16 bits */
  370 +#define R_ALPHA_GPREL16 19 /* GP relative 16 bit */
  371 +#define R_ALPHA_COPY 24 /* Copy symbol at runtime */
  372 +#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */
  373 +#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */
  374 +#define R_ALPHA_RELATIVE 27 /* Adjust by program base */
  375 +#define R_ALPHA_BRSGP 28
  376 +#define R_ALPHA_TLSGD 29
  377 +#define R_ALPHA_TLS_LDM 30
  378 +#define R_ALPHA_DTPMOD64 31
  379 +#define R_ALPHA_GOTDTPREL 32
  380 +#define R_ALPHA_DTPREL64 33
  381 +#define R_ALPHA_DTPRELHI 34
  382 +#define R_ALPHA_DTPRELLO 35
  383 +#define R_ALPHA_DTPREL16 36
  384 +#define R_ALPHA_GOTTPREL 37
  385 +#define R_ALPHA_TPREL64 38
  386 +#define R_ALPHA_TPRELHI 39
  387 +#define R_ALPHA_TPRELLO 40
  388 +#define R_ALPHA_TPREL16 41
  389 +
  390 +#define SHF_ALPHA_GPREL 0x10000000
  391 +
  392 +
  393 +/* PowerPC relocations defined by the ABIs */
  394 +#define R_PPC_NONE 0
  395 +#define R_PPC_ADDR32 1 /* 32bit absolute address */
  396 +#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
  397 +#define R_PPC_ADDR16 3 /* 16bit absolute address */
  398 +#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
  399 +#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
  400 +#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
  401 +#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
  402 +#define R_PPC_ADDR14_BRTAKEN 8
  403 +#define R_PPC_ADDR14_BRNTAKEN 9
  404 +#define R_PPC_REL24 10 /* PC relative 26 bit */
  405 +#define R_PPC_REL14 11 /* PC relative 16 bit */
  406 +#define R_PPC_REL14_BRTAKEN 12
  407 +#define R_PPC_REL14_BRNTAKEN 13
  408 +#define R_PPC_GOT16 14
  409 +#define R_PPC_GOT16_LO 15
  410 +#define R_PPC_GOT16_HI 16
  411 +#define R_PPC_GOT16_HA 17
  412 +#define R_PPC_PLTREL24 18
  413 +#define R_PPC_COPY 19
  414 +#define R_PPC_GLOB_DAT 20
  415 +#define R_PPC_JMP_SLOT 21
  416 +#define R_PPC_RELATIVE 22
  417 +#define R_PPC_LOCAL24PC 23
  418 +#define R_PPC_UADDR32 24
  419 +#define R_PPC_UADDR16 25
  420 +#define R_PPC_REL32 26
  421 +#define R_PPC_PLT32 27
  422 +#define R_PPC_PLTREL32 28
  423 +#define R_PPC_PLT16_LO 29
  424 +#define R_PPC_PLT16_HI 30
  425 +#define R_PPC_PLT16_HA 31
  426 +#define R_PPC_SDAREL16 32
  427 +#define R_PPC_SECTOFF 33
  428 +#define R_PPC_SECTOFF_LO 34
  429 +#define R_PPC_SECTOFF_HI 35
  430 +#define R_PPC_SECTOFF_HA 36
  431 +/* Keep this the last entry. */
  432 +#define R_PPC_NUM 37
  433 +
  434 +/* ARM specific declarations */
  435 +
  436 +/* Processor specific flags for the ELF header e_flags field. */
  437 +#define EF_ARM_RELEXEC 0x01
  438 +#define EF_ARM_HASENTRY 0x02
  439 +#define EF_ARM_INTERWORK 0x04
  440 +#define EF_ARM_APCS_26 0x08
  441 +#define EF_ARM_APCS_FLOAT 0x10
  442 +#define EF_ARM_PIC 0x20
  443 +#define EF_ALIGN8 0x40 /* 8-bit structure alignment is in use */
  444 +#define EF_NEW_ABI 0x80
  445 +#define EF_OLD_ABI 0x100
  446 +
  447 +/* Additional symbol types for Thumb */
  448 +#define STT_ARM_TFUNC 0xd
  449 +
  450 +/* ARM-specific values for sh_flags */
  451 +#define SHF_ARM_ENTRYSECT 0x10000000 /* Section contains an entry point */
  452 +#define SHF_ARM_COMDEF 0x80000000 /* Section may be multiply defined
  453 + in the input to a link step */
  454 +
  455 +/* ARM-specific program header flags */
  456 +#define PF_ARM_SB 0x10000000 /* Segment contains the location
  457 + addressed by the static base */
  458 +
  459 +/* ARM relocs. */
  460 +#define R_ARM_NONE 0 /* No reloc */
  461 +#define R_ARM_PC24 1 /* PC relative 26 bit branch */
  462 +#define R_ARM_ABS32 2 /* Direct 32 bit */
  463 +#define R_ARM_REL32 3 /* PC relative 32 bit */
  464 +#define R_ARM_PC13 4
  465 +#define R_ARM_ABS16 5 /* Direct 16 bit */
  466 +#define R_ARM_ABS12 6 /* Direct 12 bit */
  467 +#define R_ARM_THM_ABS5 7
  468 +#define R_ARM_ABS8 8 /* Direct 8 bit */
  469 +#define R_ARM_SBREL32 9
  470 +#define R_ARM_THM_PC22 10
  471 +#define R_ARM_THM_PC8 11
  472 +#define R_ARM_AMP_VCALL9 12
  473 +#define R_ARM_SWI24 13
  474 +#define R_ARM_THM_SWI8 14
  475 +#define R_ARM_XPC25 15
  476 +#define R_ARM_THM_XPC22 16
  477 +#define R_ARM_COPY 20 /* Copy symbol at runtime */
  478 +#define R_ARM_GLOB_DAT 21 /* Create GOT entry */
  479 +#define R_ARM_JUMP_SLOT 22 /* Create PLT entry */
  480 +#define R_ARM_RELATIVE 23 /* Adjust by program base */
  481 +#define R_ARM_GOTOFF 24 /* 32 bit offset to GOT */
  482 +#define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */
  483 +#define R_ARM_GOT32 26 /* 32 bit GOT entry */
  484 +#define R_ARM_PLT32 27 /* 32 bit PLT address */
  485 +#define R_ARM_GNU_VTENTRY 100
  486 +#define R_ARM_GNU_VTINHERIT 101
  487 +#define R_ARM_THM_PC11 102 /* thumb unconditional branch */
  488 +#define R_ARM_THM_PC9 103 /* thumb conditional branch */
  489 +#define R_ARM_RXPC25 249
  490 +#define R_ARM_RSBREL32 250
  491 +#define R_ARM_THM_RPC22 251
  492 +#define R_ARM_RREL32 252
  493 +#define R_ARM_RABS22 253
  494 +#define R_ARM_RPC24 254
  495 +#define R_ARM_RBASE 255
  496 +/* Keep this the last entry. */
  497 +#define R_ARM_NUM 256
  498 +
  499 +/* s390 relocations defined by the ABIs */
  500 +#define R_390_NONE 0 /* No reloc. */
  501 +#define R_390_8 1 /* Direct 8 bit. */
  502 +#define R_390_12 2 /* Direct 12 bit. */
  503 +#define R_390_16 3 /* Direct 16 bit. */
  504 +#define R_390_32 4 /* Direct 32 bit. */
  505 +#define R_390_PC32 5 /* PC relative 32 bit. */
  506 +#define R_390_GOT12 6 /* 12 bit GOT offset. */
  507 +#define R_390_GOT32 7 /* 32 bit GOT offset. */
  508 +#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
  509 +#define R_390_COPY 9 /* Copy symbol at runtime. */
  510 +#define R_390_GLOB_DAT 10 /* Create GOT entry. */
  511 +#define R_390_JMP_SLOT 11 /* Create PLT entry. */
  512 +#define R_390_RELATIVE 12 /* Adjust by program base. */
  513 +#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */
  514 +#define R_390_GOTPC 14 /* 32 bit PC rel. offset to GOT. */
  515 +#define R_390_GOT16 15 /* 16 bit GOT offset. */
  516 +#define R_390_PC16 16 /* PC relative 16 bit. */
  517 +#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
  518 +#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
  519 +#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
  520 +#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
  521 +#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
  522 +#define R_390_64 22 /* Direct 64 bit. */
  523 +#define R_390_PC64 23 /* PC relative 64 bit. */
  524 +#define R_390_GOT64 24 /* 64 bit GOT offset. */
  525 +#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
  526 +#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
  527 +#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */
  528 +#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */
  529 +#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */
  530 +#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */
  531 +#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */
  532 +#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */
  533 +#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */
  534 +#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */
  535 +#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */
  536 +#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */
  537 +#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */
  538 +#define R_390_TLS_GDCALL 38 /* Tag for function call in general
  539 + dynamic TLS code. */
  540 +#define R_390_TLS_LDCALL 39 /* Tag for function call in local
  541 + dynamic TLS code. */
  542 +#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic
  543 + thread local data. */
  544 +#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic
  545 + thread local data. */
  546 +#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS
  547 + block offset. */
  548 +#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS
  549 + block offset. */
  550 +#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS
  551 + block offset. */
  552 +#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic
  553 + thread local data in LD code. */
  554 +#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic
  555 + thread local data in LD code. */
  556 +#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for
  557 + negated static TLS block offset. */
  558 +#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for
  559 + negated static TLS block offset. */
  560 +#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for
  561 + negated static TLS block offset. */
  562 +#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to
  563 + static TLS block. */
  564 +#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to
  565 + static TLS block. */
  566 +#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS
  567 + block. */
  568 +#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS
  569 + block. */
  570 +#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */
  571 +#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */
  572 +#define R_390_TLS_TPOFF 56 /* Negate offset in static TLS
  573 + block. */
  574 +/* Keep this the last entry. */
  575 +#define R_390_NUM 57
  576 +
  577 +/* x86-64 relocation types */
  578 +#define R_X86_64_NONE 0 /* No reloc */
  579 +#define R_X86_64_64 1 /* Direct 64 bit */
  580 +#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
  581 +#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
  582 +#define R_X86_64_PLT32 4 /* 32 bit PLT address */
  583 +#define R_X86_64_COPY 5 /* Copy symbol at runtime */
  584 +#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
  585 +#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
  586 +#define R_X86_64_RELATIVE 8 /* Adjust by program base */
  587 +#define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative
  588 + offset to GOT */
  589 +#define R_X86_64_32 10 /* Direct 32 bit zero extended */
  590 +#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
  591 +#define R_X86_64_16 12 /* Direct 16 bit zero extended */
  592 +#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
  593 +#define R_X86_64_8 14 /* Direct 8 bit sign extended */
  594 +#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
  595 +
  596 +#define R_X86_64_NUM 16
  597 +
  598 +/* Legal values for e_flags field of Elf64_Ehdr. */
  599 +
  600 +#define EF_ALPHA_32BIT 1 /* All addresses are below 2GB */
  601 +
  602 +/* HPPA specific definitions. */
  603 +
  604 +/* Legal values for e_flags field of Elf32_Ehdr. */
  605 +
  606 +#define EF_PARISC_TRAPNIL 0x00010000 /* Trap nil pointer dereference. */
  607 +#define EF_PARISC_EXT 0x00020000 /* Program uses arch. extensions. */
  608 +#define EF_PARISC_LSB 0x00040000 /* Program expects little endian. */
  609 +#define EF_PARISC_WIDE 0x00080000 /* Program expects wide mode. */
  610 +#define EF_PARISC_NO_KABP 0x00100000 /* No kernel assisted branch
  611 + prediction. */
  612 +#define EF_PARISC_LAZYSWAP 0x00400000 /* Allow lazy swapping. */
  613 +#define EF_PARISC_ARCH 0x0000ffff /* Architecture version. */
  614 +
  615 +/* Defined values for `e_flags & EF_PARISC_ARCH' are: */
  616 +
  617 +#define EFA_PARISC_1_0 0x020b /* PA-RISC 1.0 big-endian. */
  618 +#define EFA_PARISC_1_1 0x0210 /* PA-RISC 1.1 big-endian. */
  619 +#define EFA_PARISC_2_0 0x0214 /* PA-RISC 2.0 big-endian. */
  620 +
  621 +/* Additional section indeces. */
  622 +
  623 +#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tenatively declared
  624 + symbols in ANSI C. */
  625 +#define SHN_PARISC_HUGE_COMMON 0xff01 /* Common blocks in huge model. */
  626 +
  627 +/* Legal values for sh_type field of Elf32_Shdr. */
  628 +
  629 +#define SHT_PARISC_EXT 0x70000000 /* Contains product specific ext. */
  630 +#define SHT_PARISC_UNWIND 0x70000001 /* Unwind information. */
  631 +#define SHT_PARISC_DOC 0x70000002 /* Debug info for optimized code. */
  632 +
  633 +/* Legal values for sh_flags field of Elf32_Shdr. */
  634 +
  635 +#define SHF_PARISC_SHORT 0x20000000 /* Section with short addressing. */
  636 +#define SHF_PARISC_HUGE 0x40000000 /* Section far from gp. */
  637 +#define SHF_PARISC_SBP 0x80000000 /* Static branch prediction code. */
  638 +
  639 +/* Legal values for ST_TYPE subfield of st_info (symbol type). */
  640 +
  641 +#define STT_PARISC_MILLICODE 13 /* Millicode function entry point. */
  642 +
  643 +#define STT_HP_OPAQUE (STT_LOOS + 0x1)
  644 +#define STT_HP_STUB (STT_LOOS + 0x2)
  645 +
  646 +/* HPPA relocs. */
  647 +
  648 +#define R_PARISC_NONE 0 /* No reloc. */
  649 +#define R_PARISC_DIR32 1 /* Direct 32-bit reference. */
  650 +#define R_PARISC_DIR21L 2 /* Left 21 bits of eff. address. */
  651 +#define R_PARISC_DIR17R 3 /* Right 17 bits of eff. address. */
  652 +#define R_PARISC_DIR17F 4 /* 17 bits of eff. address. */
  653 +#define R_PARISC_DIR14R 6 /* Right 14 bits of eff. address. */
  654 +#define R_PARISC_PCREL32 9 /* 32-bit rel. address. */
  655 +#define R_PARISC_PCREL21L 10 /* Left 21 bits of rel. address. */
  656 +#define R_PARISC_PCREL17R 11 /* Right 17 bits of rel. address. */
  657 +#define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
  658 +#define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
  659 +#define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
  660 +#define R_PARISC_DPREL14R 22 /* Right 14 bits of rel. address. */
  661 +#define R_PARISC_GPREL21L 26 /* GP-relative, left 21 bits. */
  662 +#define R_PARISC_GPREL14R 30 /* GP-relative, right 14 bits. */
  663 +#define R_PARISC_LTOFF21L 34 /* LT-relative, left 21 bits. */
  664 +#define R_PARISC_LTOFF14R 38 /* LT-relative, right 14 bits. */
  665 +#define R_PARISC_SECREL32 41 /* 32 bits section rel. address. */
  666 +#define R_PARISC_SEGBASE 48 /* No relocation, set segment base. */
  667 +#define R_PARISC_SEGREL32 49 /* 32 bits segment rel. address. */
  668 +#define R_PARISC_PLTOFF21L 50 /* PLT rel. address, left 21 bits. */
  669 +#define R_PARISC_PLTOFF14R 54 /* PLT rel. address, right 14 bits. */
  670 +#define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
  671 +#define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
  672 +#define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
  673 +#define R_PARISC_FPTR64 64 /* 64 bits function address. */
  674 +#define R_PARISC_PLABEL32 65 /* 32 bits function address. */
  675 +#define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
  676 +#define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
  677 +#define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
  678 +#define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
  679 +#define R_PARISC_PCREL16F 77 /* 16 bits PC-rel. address. */
  680 +#define R_PARISC_PCREL16WF 78 /* 16 bits PC-rel. address. */
  681 +#define R_PARISC_PCREL16DF 79 /* 16 bits PC-rel. address. */
  682 +#define R_PARISC_DIR64 80 /* 64 bits of eff. address. */
  683 +#define R_PARISC_DIR14WR 83 /* 14 bits of eff. address. */
  684 +#define R_PARISC_DIR14DR 84 /* 14 bits of eff. address. */
  685 +#define R_PARISC_DIR16F 85 /* 16 bits of eff. address. */
  686 +#define R_PARISC_DIR16WF 86 /* 16 bits of eff. address. */
  687 +#define R_PARISC_DIR16DF 87 /* 16 bits of eff. address. */
  688 +#define R_PARISC_GPREL64 88 /* 64 bits of GP-rel. address. */
  689 +#define R_PARISC_GPREL14WR 91 /* GP-rel. address, right 14 bits. */
  690 +#define R_PARISC_GPREL14DR 92 /* GP-rel. address, right 14 bits. */
  691 +#define R_PARISC_GPREL16F 93 /* 16 bits GP-rel. address. */
  692 +#define R_PARISC_GPREL16WF 94 /* 16 bits GP-rel. address. */
  693 +#define R_PARISC_GPREL16DF 95 /* 16 bits GP-rel. address. */
  694 +#define R_PARISC_LTOFF64 96 /* 64 bits LT-rel. address. */
  695 +#define R_PARISC_LTOFF14WR 99 /* LT-rel. address, right 14 bits. */
  696 +#define R_PARISC_LTOFF14DR 100 /* LT-rel. address, right 14 bits. */
  697 +#define R_PARISC_LTOFF16F 101 /* 16 bits LT-rel. address. */
  698 +#define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
  699 +#define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
  700 +#define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
  701 +#define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */
  702 +#define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */
  703 +#define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */
  704 +#define R_PARISC_PLTOFF16F 117 /* 16 bits LT-rel. address. */
  705 +#define R_PARISC_PLTOFF16WF 118 /* 16 bits PLT-rel. address. */
  706 +#define R_PARISC_PLTOFF16DF 119 /* 16 bits PLT-rel. address. */
  707 +#define R_PARISC_LTOFF_FPTR64 120 /* 64 bits LT-rel. function ptr. */
  708 +#define R_PARISC_LTOFF_FPTR14WR 123 /* LT-rel. fct. ptr., right 14 bits. */
  709 +#define R_PARISC_LTOFF_FPTR14DR 124 /* LT-rel. fct. ptr., right 14 bits. */
  710 +#define R_PARISC_LTOFF_FPTR16F 125 /* 16 bits LT-rel. function ptr. */
  711 +#define R_PARISC_LTOFF_FPTR16WF 126 /* 16 bits LT-rel. function ptr. */
  712 +#define R_PARISC_LTOFF_FPTR16DF 127 /* 16 bits LT-rel. function ptr. */
  713 +#define R_PARISC_LORESERVE 128
  714 +#define R_PARISC_COPY 128 /* Copy relocation. */
  715 +#define R_PARISC_IPLT 129 /* Dynamic reloc, imported PLT */
  716 +#define R_PARISC_EPLT 130 /* Dynamic reloc, exported PLT */
  717 +#define R_PARISC_TPREL32 153 /* 32 bits TP-rel. address. */
  718 +#define R_PARISC_TPREL21L 154 /* TP-rel. address, left 21 bits. */
  719 +#define R_PARISC_TPREL14R 158 /* TP-rel. address, right 14 bits. */
  720 +#define R_PARISC_LTOFF_TP21L 162 /* LT-TP-rel. address, left 21 bits. */
  721 +#define R_PARISC_LTOFF_TP14R 166 /* LT-TP-rel. address, right 14 bits.*/
  722 +#define R_PARISC_LTOFF_TP14F 167 /* 14 bits LT-TP-rel. address. */
  723 +#define R_PARISC_TPREL64 216 /* 64 bits TP-rel. address. */
  724 +#define R_PARISC_TPREL14WR 219 /* TP-rel. address, right 14 bits. */
  725 +#define R_PARISC_TPREL14DR 220 /* TP-rel. address, right 14 bits. */
  726 +#define R_PARISC_TPREL16F 221 /* 16 bits TP-rel. address. */
  727 +#define R_PARISC_TPREL16WF 222 /* 16 bits TP-rel. address. */
  728 +#define R_PARISC_TPREL16DF 223 /* 16 bits TP-rel. address. */
  729 +#define R_PARISC_LTOFF_TP64 224 /* 64 bits LT-TP-rel. address. */
  730 +#define R_PARISC_LTOFF_TP14WR 227 /* LT-TP-rel. address, right 14 bits.*/
  731 +#define R_PARISC_LTOFF_TP14DR 228 /* LT-TP-rel. address, right 14 bits.*/
  732 +#define R_PARISC_LTOFF_TP16F 229 /* 16 bits LT-TP-rel. address. */
  733 +#define R_PARISC_LTOFF_TP16WF 230 /* 16 bits LT-TP-rel. address. */
  734 +#define R_PARISC_LTOFF_TP16DF 231 /* 16 bits LT-TP-rel. address. */
  735 +#define R_PARISC_HIRESERVE 255
  736 +
  737 +/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */
  738 +
  739 +#define PT_HP_TLS (PT_LOOS + 0x0)
  740 +#define PT_HP_CORE_NONE (PT_LOOS + 0x1)
  741 +#define PT_HP_CORE_VERSION (PT_LOOS + 0x2)
  742 +#define PT_HP_CORE_KERNEL (PT_LOOS + 0x3)
  743 +#define PT_HP_CORE_COMM (PT_LOOS + 0x4)
  744 +#define PT_HP_CORE_PROC (PT_LOOS + 0x5)
  745 +#define PT_HP_CORE_LOADABLE (PT_LOOS + 0x6)
  746 +#define PT_HP_CORE_STACK (PT_LOOS + 0x7)
  747 +#define PT_HP_CORE_SHM (PT_LOOS + 0x8)
  748 +#define PT_HP_CORE_MMF (PT_LOOS + 0x9)
  749 +#define PT_HP_PARALLEL (PT_LOOS + 0x10)
  750 +#define PT_HP_FASTBIND (PT_LOOS + 0x11)
  751 +#define PT_HP_OPT_ANNOT (PT_LOOS + 0x12)
  752 +#define PT_HP_HSL_ANNOT (PT_LOOS + 0x13)
  753 +#define PT_HP_STACK (PT_LOOS + 0x14)
  754 +
  755 +#define PT_PARISC_ARCHEXT 0x70000000
  756 +#define PT_PARISC_UNWIND 0x70000001
  757 +
  758 +/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr. */
  759 +
  760 +#define PF_PARISC_SBP 0x08000000
  761 +
  762 +#define PF_HP_PAGE_SIZE 0x00100000
  763 +#define PF_HP_FAR_SHARED 0x00200000
  764 +#define PF_HP_NEAR_SHARED 0x00400000
  765 +#define PF_HP_CODE 0x01000000
  766 +#define PF_HP_MODIFY 0x02000000
  767 +#define PF_HP_LAZYSWAP 0x04000000
  768 +#define PF_HP_SBP 0x08000000
  769 +
  770 +
188 771 typedef struct elf32_rel {
189 772 Elf32_Addr r_offset;
190 773 Elf32_Word r_info;
191 774 } Elf32_Rel;
192 775  
193 776 typedef struct elf64_rel {
194   - unsigned long long r_offset; /* Location at which to apply the action */
195   - unsigned long long r_info; /* index and type of relocation */
  777 + Elf64_Addr r_offset; /* Location at which to apply the action */
  778 + Elf64_Xword r_info; /* index and type of relocation */
196 779 } Elf64_Rel;
197 780  
198 781 typedef struct elf32_rela{
... ... @@ -202,9 +785,9 @@ typedef struct elf32_rela{
202 785 } Elf32_Rela;
203 786  
204 787 typedef struct elf64_rela {
205   - unsigned long long r_offset; /* Location at which to apply the action */
206   - unsigned long long r_info; /* index and type of relocation */
207   - unsigned long long r_addend; /* Constant addend used to compute value */
  788 + Elf64_Addr r_offset; /* Location at which to apply the action */
  789 + Elf64_Xword r_info; /* index and type of relocation */
  790 + Elf64_Sxword r_addend; /* Constant addend used to compute value */
208 791 } Elf64_Rela;
209 792  
210 793 typedef struct elf32_sym{
... ... @@ -217,12 +800,12 @@ typedef struct elf32_sym{
217 800 } Elf32_Sym;
218 801  
219 802 typedef struct elf64_sym {
220   - unsigned int st_name; /* Symbol name, index in string tbl */
221   - unsigned char st_info; /* Type and binding attributes */
222   - unsigned char st_other; /* No defined meaning, 0 */
223   - unsigned short st_shndx; /* Associated section index */
224   - unsigned long long st_value; /* Value of the symbol */
225   - unsigned long long st_size; /* Associated symbol size */
  803 + Elf64_Word st_name; /* Symbol name, index in string tbl */
  804 + unsigned char st_info; /* Type and binding attributes */
  805 + unsigned char st_other; /* No defined meaning, 0 */
  806 + Elf64_Half st_shndx; /* Associated section index */
  807 + Elf64_Addr st_value; /* Value of the symbol */
  808 + Elf64_Xword st_size; /* Associated symbol size */
226 809 } Elf64_Sym;
227 810  
228 811  
... ... @@ -247,19 +830,19 @@ typedef struct elf32_hdr{
247 830  
248 831 typedef struct elf64_hdr {
249 832 unsigned char e_ident[16]; /* ELF "magic number" */
250   - short int e_type;
251   - short unsigned int e_machine;
252   - int e_version;
253   - unsigned long long e_entry; /* Entry point virtual address */
254   - unsigned long long e_phoff; /* Program header table file offset */
255   - unsigned long long e_shoff; /* Section header table file offset */
256   - int e_flags;
257   - short int e_ehsize;
258   - short int e_phentsize;
259   - short int e_phnum;
260   - short int e_shentsize;
261   - short int e_shnum;
262   - short int e_shstrndx;
  833 + Elf64_Half e_type;
  834 + Elf64_Half e_machine;
  835 + Elf64_Word e_version;
  836 + Elf64_Addr e_entry; /* Entry point virtual address */
  837 + Elf64_Off e_phoff; /* Program header table file offset */
  838 + Elf64_Off e_shoff; /* Section header table file offset */
  839 + Elf64_Word e_flags;
  840 + Elf64_Half e_ehsize;
  841 + Elf64_Half e_phentsize;
  842 + Elf64_Half e_phnum;
  843 + Elf64_Half e_shentsize;
  844 + Elf64_Half e_shnum;
  845 + Elf64_Half e_shstrndx;
263 846 } Elf64_Ehdr;
264 847  
265 848 /* These constants define the permissions on sections in the program
... ... @@ -280,14 +863,14 @@ typedef struct elf32_phdr{
280 863 } Elf32_Phdr;
281 864  
282 865 typedef struct elf64_phdr {
283   - int p_type;
284   - int p_flags;
285   - unsigned long long p_offset; /* Segment file offset */
286   - unsigned long long p_vaddr; /* Segment virtual address */
287   - unsigned long long p_paddr; /* Segment physical address */
288   - unsigned long long p_filesz; /* Segment size in file */
289   - unsigned long long p_memsz; /* Segment size in memory */
290   - unsigned long long p_align; /* Segment alignment, file & memory */
  866 + Elf64_Word p_type;
  867 + Elf64_Word p_flags;
  868 + Elf64_Off p_offset; /* Segment file offset */
  869 + Elf64_Addr p_vaddr; /* Segment virtual address */
  870 + Elf64_Addr p_paddr; /* Segment physical address */
  871 + Elf64_Xword p_filesz; /* Segment size in file */
  872 + Elf64_Xword p_memsz; /* Segment size in memory */
  873 + Elf64_Xword p_align; /* Segment alignment, file & memory */
291 874 } Elf64_Phdr;
292 875  
293 876 /* sh_type */
... ... @@ -308,12 +891,17 @@ typedef struct elf64_phdr {
308 891 #define SHT_HIPROC 0x7fffffff
309 892 #define SHT_LOUSER 0x80000000
310 893 #define SHT_HIUSER 0xffffffff
  894 +#define SHT_MIPS_LIST 0x70000000
  895 +#define SHT_MIPS_CONFLICT 0x70000002
  896 +#define SHT_MIPS_GPTAB 0x70000003
  897 +#define SHT_MIPS_UCODE 0x70000004
311 898  
312 899 /* sh_flags */
313 900 #define SHF_WRITE 0x1
314 901 #define SHF_ALLOC 0x2
315 902 #define SHF_EXECINSTR 0x4
316 903 #define SHF_MASKPROC 0xf0000000
  904 +#define SHF_MIPS_GPREL 0x10000000
317 905  
318 906 /* special section indexes */
319 907 #define SHN_UNDEF 0
... ... @@ -323,8 +911,9 @@ typedef struct elf64_phdr {
323 911 #define SHN_ABS 0xfff1
324 912 #define SHN_COMMON 0xfff2
325 913 #define SHN_HIRESERVE 0xffff
  914 +#define SHN_MIPS_ACCOMON 0xff00
326 915  
327   -typedef struct {
  916 +typedef struct elf32_shdr {
328 917 Elf32_Word sh_name;
329 918 Elf32_Word sh_type;
330 919 Elf32_Word sh_flags;
... ... @@ -338,16 +927,16 @@ typedef struct {
338 927 } Elf32_Shdr;
339 928  
340 929 typedef struct elf64_shdr {
341   - unsigned int sh_name; /* Section name, index in string tbl */
342   - unsigned int sh_type; /* Type of section */
343   - unsigned long long sh_flags; /* Miscellaneous section attributes */
344   - unsigned long long sh_addr; /* Section virtual addr at execution */
345   - unsigned long long sh_offset; /* Section file offset */
346   - unsigned long long sh_size; /* Size of section in bytes */
347   - unsigned int sh_link; /* Index of another section */
348   - unsigned int sh_info; /* Additional section information */
349   - unsigned long long sh_addralign; /* Section alignment */
350   - unsigned long long sh_entsize; /* Entry size if section holds table */
  930 + Elf64_Word sh_name; /* Section name, index in string tbl */
  931 + Elf64_Word sh_type; /* Type of section */
  932 + Elf64_Xword sh_flags; /* Miscellaneous section attributes */
  933 + Elf64_Addr sh_addr; /* Section virtual addr at execution */
  934 + Elf64_Off sh_offset; /* Section file offset */
  935 + Elf64_Xword sh_size; /* Size of section in bytes */
  936 + Elf64_Word sh_link; /* Index of another section */
  937 + Elf64_Word sh_info; /* Additional section information */
  938 + Elf64_Xword sh_addralign; /* Section alignment */
  939 + Elf64_Xword sh_entsize; /* Entry size if section holds table */
351 940 } Elf64_Shdr;
352 941  
353 942 #define EI_MAG0 0 /* e_ident[] indexes */
... ... @@ -384,6 +973,8 @@ typedef struct elf64_shdr {
384 973 #define NT_PRFPREG 2
385 974 #define NT_PRPSINFO 3
386 975 #define NT_TASKSTRUCT 4
  976 +#define NT_PRXFPREG 0x46e62b7f /* copied from gdb5.1/include/elf/common.h */
  977 +
387 978  
388 979 /* Note header in a PT_NOTE section */
389 980 typedef struct elf32_note {
... ... @@ -393,33 +984,49 @@ typedef struct elf32_note {
393 984 } Elf32_Nhdr;
394 985  
395 986 /* Note header in a PT_NOTE section */
396   -/*
397   - * For now we use the 32 bit version of the structure until we figure
398   - * out whether we need anything better. Note - on the Alpha, "unsigned int"
399   - * is only 32 bits.
400   - */
401 987 typedef struct elf64_note {
402   - unsigned int n_namesz; /* Name size */
403   - unsigned int n_descsz; /* Content size */
404   - unsigned int n_type; /* Content type */
  988 + Elf64_Word n_namesz; /* Name size */
  989 + Elf64_Word n_descsz; /* Content size */
  990 + Elf64_Word n_type; /* Content type */
405 991 } Elf64_Nhdr;
406 992  
407   -#define ELF_START_MMAP 0x80000000
408   -
409 993 #if ELF_CLASS == ELFCLASS32
410 994  
411   -extern Elf32_Dyn _DYNAMIC [];
412 995 #define elfhdr elf32_hdr
413 996 #define elf_phdr elf32_phdr
414 997 #define elf_note elf32_note
  998 +#define elf_shdr elf32_shdr
  999 +
  1000 +#ifdef ELF_USES_RELOCA
  1001 +# define ELF_RELOC Elf32_Rela
  1002 +#else
  1003 +# define ELF_RELOC Elf32_Rel
  1004 +#endif
415 1005  
416 1006 #else
417 1007  
418   -extern Elf64_Dyn _DYNAMIC [];
419 1008 #define elfhdr elf64_hdr
420 1009 #define elf_phdr elf64_phdr
421 1010 #define elf_note elf64_note
  1011 +#define elf_shdr elf64_shdr
  1012 +
  1013 +#ifdef ELF_USES_RELOCA
  1014 +# define ELF_RELOC Elf64_Rela
  1015 +#else
  1016 +# define ELF_RELOC Elf64_Rel
  1017 +#endif
  1018 +
  1019 +#endif /* ELF_CLASS */
422 1020  
  1021 +#ifndef ElfW
  1022 +# if ELF_CLASS == ELFCLASS32
  1023 +# define ElfW(x) Elf32_ ## x
  1024 +# define ELFW(x) ELF32_ ## x
  1025 +# else
  1026 +# define ElfW(x) Elf64_ ## x
  1027 +# define ELFW(x) ELF64_ ## x
  1028 +# endif
423 1029 #endif
424 1030  
425 1031  
  1032 +#endif /* _ELF_H */
... ...