Merge branch 'devel' into jreiser
Conflicts: src/stub/amd64-win64.pep.h src/stub/powerpc-linux.elf-entry.h src/stub/powerpc-linux.elf-fold.h src/stub/src/amd64-win64.pep.S src/stub/src/arch/powerpc/32/ppc_regs.h src/stub/src/arch/powerpc/64le/lzma_d.S src/stub/src/powerpc-linux.elf-entry.S src/stub/src/powerpc64le-darwin.dylib-entry.S src/stub/src/powerpc64le-darwin.macho-entry.S src/stub/src/powerpc64le-linux.elf-entry.S src/stub/src/powerpc64le-linux.kernel.vmlinux.S src/stub/tmp/amd64-win64.pep.bin.dump src/stub/tmp/powerpc-linux.elf-entry.bin.dump src/stub/tmp/powerpc-linux.elf-fold.map modified: ../../.github/travis_testsuite_1.sh modified: ../p_lx_elf.cpp modified: ../p_unix.cpp modified: ../p_unix.h modified: amd64-win64.pep.h modified: arm.v4a-linux.elf-fold.h modified: arm.v5a-linux.elf-fold.h modified: armeb.v4a-linux.elf-fold.h modified: powerpc-darwin.dylib-entry.h modified: powerpc-darwin.macho-entry.h copied: powerpc-darwin.dylib-entry.h -> powerpc-linux.elf-entry.h modified: powerpc-linux.elf-fold.h modified: powerpc-linux.kernel.vmlinux.h modified: powerpc64le-linux.elf-fold.h modified: src/amd64-win64.pep.S modified: src/arch/powerpc/32/bxx.S modified: src/arch/powerpc/32/lzma_d.S modified: src/arch/powerpc/32/nrv2d_d.S modified: src/arch/powerpc/32/nrv2e_d.S modified: src/arch/powerpc/32/ppc_regs.h modified: src/arch/powerpc/64le/bxx.S modified: src/arch/powerpc/64le/lzma_d.S modified: src/arch/powerpc/64le/nrv2b_d.S modified: src/arch/powerpc/64le/nrv2d_d.S modified: src/arch/powerpc/64le/nrv2e_d.S modified: src/arm.v4a-linux.elf-fold.S modified: src/powerpc-darwin.macho-fold.S modified: src/powerpc-linux.elf-entry.S modified: src/powerpc-linux.elf-fold.S modified: src/powerpc64le-darwin.dylib-entry.S modified: src/powerpc64le-darwin.macho-entry.S modified: src/powerpc64le-darwin.macho-fold.S modified: src/powerpc64le-linux.elf-entry.S modified: src/powerpc64le-linux.elf-fold.S modified: src/powerpc64le-linux.kernel.vmlinux.S modified: tmp/amd64-win64.pep.bin.dump modified: tmp/arm.v4a-linux.elf-fold.map modified: tmp/arm.v5a-linux.elf-fold.map modified: tmp/armeb.v4a-linux.elf-fold.map modified: tmp/powerpc-darwin.dylib-entry.bin.dump modified: tmp/powerpc-darwin.macho-entry.bin.dump modified: tmp/powerpc-linux.elf-entry.bin.dump modified: tmp/powerpc-linux.elf-fold.map modified: tmp/powerpc-linux.kernel.vmlinux.bin.dump
This commit is contained in:
John Reiser
@@ -25,33 +25,33 @@ Idx Name Size VMA LMA File off Algn
|
||||
20 PETLSHAK2 00000004 0000000000000000 0000000000000000 0000171c 2**0 CONTENTS, READONLY
|
||||
21 PECTTPOS 00000007 0000000000000000 0000000000000000 00001720 2**0 CONTENTS, RELOC, READONLY
|
||||
22 PECTTNUL 00000003 0000000000000000 0000000000000000 00001727 2**0 CONTENTS, READONLY
|
||||
23 PEFILTER49 0000004d 0000000000000000 0000000000000000 0000172a 2**0 CONTENTS, RELOC, READONLY
|
||||
24 PEIMPORT 00000034 0000000000000000 0000000000000000 00001777 2**0 CONTENTS, RELOC, READONLY
|
||||
25 PEIBYORD 00000002 0000000000000000 0000000000000000 000017ab 2**0 CONTENTS, RELOC, READONLY
|
||||
26 PEK32ORD 00000012 0000000000000000 0000000000000000 000017ad 2**0 CONTENTS, RELOC, READONLY
|
||||
27 PEIMORD1 0000000a 0000000000000000 0000000000000000 000017bf 2**0 CONTENTS, RELOC, READONLY
|
||||
28 PEIMPOR2 00000021 0000000000000000 0000000000000000 000017c9 2**0 CONTENTS, RELOC, READONLY
|
||||
29 PEIERDLL 0000000b 0000000000000000 0000000000000000 000017ea 2**0 CONTENTS, READONLY
|
||||
30 PEIEREXE 00000006 0000000000000000 0000000000000000 000017f5 2**0 CONTENTS, RELOC, READONLY
|
||||
31 PEIMDONE 00000004 0000000000000000 0000000000000000 000017fb 2**0 CONTENTS, READONLY
|
||||
32 PERELOC1 00000007 0000000000000000 0000000000000000 000017ff 2**0 CONTENTS, RELOC, READONLY
|
||||
33 PERELOC2 00000004 0000000000000000 0000000000000000 00001806 2**0 CONTENTS, READONLY
|
||||
34 PERELOC3 00000030 0000000000000000 0000000000000000 0000180a 2**0 CONTENTS, RELOC, READONLY
|
||||
35 REL64BIG 0000000a 0000000000000000 0000000000000000 0000183a 2**0 CONTENTS, RELOC, READONLY
|
||||
36 RELOC64J 00000002 0000000000000000 0000000000000000 00001844 2**0 CONTENTS, RELOC, READONLY
|
||||
37 PERLOHI0 0000000a 0000000000000000 0000000000000000 00001846 2**0 CONTENTS, RELOC, READONLY
|
||||
38 PERELLO0 0000000b 0000000000000000 0000000000000000 00001850 2**0 CONTENTS, READONLY
|
||||
39 PERELHI0 0000000e 0000000000000000 0000000000000000 0000185b 2**0 CONTENTS, READONLY
|
||||
40 PEDEPHAK 0000004b 0000000000000000 0000000000000000 00001869 2**0 CONTENTS, RELOC, READONLY
|
||||
41 PETLSC 0000001b 0000000000000000 0000000000000000 000018b4 2**0 CONTENTS, RELOC, READONLY
|
||||
42 PEMAIN20 00000004 0000000000000000 0000000000000000 000018cf 2**0 CONTENTS, READONLY
|
||||
43 CLEARSTACK 00000010 0000000000000000 0000000000000000 000018d3 2**0 CONTENTS, READONLY
|
||||
44 PEMAIN21 00000000 0000000000000000 0000000000000000 000018e3 2**0 CONTENTS, READONLY
|
||||
45 PEISDLL9 0000000f 0000000000000000 0000000000000000 000018e3 2**0 CONTENTS, READONLY
|
||||
46 PERETURN 00000004 0000000000000000 0000000000000000 000018f2 2**0 CONTENTS, READONLY
|
||||
47 PEDOJUMP 00000005 0000000000000000 0000000000000000 000018f6 2**0 CONTENTS, RELOC, READONLY
|
||||
48 PETLSC2 00000026 0000000000000000 0000000000000000 000018fb 2**0 CONTENTS, RELOC, READONLY
|
||||
49 UPX1HEAD 00000020 0000000000000000 0000000000000000 00001921 2**0 CONTENTS, READONLY
|
||||
23 PEFILTER49 00000050 0000000000000000 0000000000000000 0000172a 2**0 CONTENTS, RELOC, READONLY
|
||||
24 PEIMPORT 00000034 0000000000000000 0000000000000000 0000177a 2**0 CONTENTS, RELOC, READONLY
|
||||
25 PEIBYORD 00000002 0000000000000000 0000000000000000 000017ae 2**0 CONTENTS, RELOC, READONLY
|
||||
26 PEK32ORD 00000012 0000000000000000 0000000000000000 000017b0 2**0 CONTENTS, RELOC, READONLY
|
||||
27 PEIMORD1 0000000a 0000000000000000 0000000000000000 000017c2 2**0 CONTENTS, RELOC, READONLY
|
||||
28 PEIMPOR2 00000021 0000000000000000 0000000000000000 000017cc 2**0 CONTENTS, RELOC, READONLY
|
||||
29 PEIERDLL 0000000b 0000000000000000 0000000000000000 000017ed 2**0 CONTENTS, READONLY
|
||||
30 PEIEREXE 00000006 0000000000000000 0000000000000000 000017f8 2**0 CONTENTS, RELOC, READONLY
|
||||
31 PEIMDONE 00000004 0000000000000000 0000000000000000 000017fe 2**0 CONTENTS, READONLY
|
||||
32 PERELOC1 00000007 0000000000000000 0000000000000000 00001802 2**0 CONTENTS, RELOC, READONLY
|
||||
33 PERELOC2 00000004 0000000000000000 0000000000000000 00001809 2**0 CONTENTS, READONLY
|
||||
34 PERELOC3 00000030 0000000000000000 0000000000000000 0000180d 2**0 CONTENTS, RELOC, READONLY
|
||||
35 REL64BIG 0000000a 0000000000000000 0000000000000000 0000183d 2**0 CONTENTS, RELOC, READONLY
|
||||
36 RELOC64J 00000002 0000000000000000 0000000000000000 00001847 2**0 CONTENTS, RELOC, READONLY
|
||||
37 PERLOHI0 0000000a 0000000000000000 0000000000000000 00001849 2**0 CONTENTS, RELOC, READONLY
|
||||
38 PERELLO0 0000000b 0000000000000000 0000000000000000 00001853 2**0 CONTENTS, READONLY
|
||||
39 PERELHI0 0000000e 0000000000000000 0000000000000000 0000185e 2**0 CONTENTS, READONLY
|
||||
40 PEDEPHAK 0000004b 0000000000000000 0000000000000000 0000186c 2**0 CONTENTS, RELOC, READONLY
|
||||
41 PETLSC 0000001b 0000000000000000 0000000000000000 000018b7 2**0 CONTENTS, RELOC, READONLY
|
||||
42 PEMAIN20 00000004 0000000000000000 0000000000000000 000018d2 2**0 CONTENTS, READONLY
|
||||
43 CLEARSTACK 00000010 0000000000000000 0000000000000000 000018d6 2**0 CONTENTS, READONLY
|
||||
44 PEMAIN21 00000000 0000000000000000 0000000000000000 000018e6 2**0 CONTENTS, READONLY
|
||||
45 PEISDLL9 0000000f 0000000000000000 0000000000000000 000018e6 2**0 CONTENTS, READONLY
|
||||
46 PERETURN 00000004 0000000000000000 0000000000000000 000018f5 2**0 CONTENTS, READONLY
|
||||
47 PEDOJUMP 00000005 0000000000000000 0000000000000000 000018f9 2**0 CONTENTS, RELOC, READONLY
|
||||
48 PETLSC2 00000026 0000000000000000 0000000000000000 000018fe 2**0 CONTENTS, RELOC, READONLY
|
||||
49 UPX1HEAD 00000020 0000000000000000 0000000000000000 00001924 2**0 CONTENTS, READONLY
|
||||
SYMBOL TABLE:
|
||||
0000000000000000 l d NRV_HEAD 0000000000000000 NRV_HEAD
|
||||
0000000000000000 l PEIMDONE 0000000000000000 imports_done
|
||||
@@ -183,8 +183,8 @@ OFFSET TYPE VALUE
|
||||
|
||||
RELOCATION RECORDS FOR [PEFILTER49]:
|
||||
OFFSET TYPE VALUE
|
||||
0000000000000001 R_X86_64_32 filter_length
|
||||
0000000000000006 R_X86_64_8 filter_cto
|
||||
0000000000000007 R_X86_64_32S filter_length
|
||||
000000000000000c R_X86_64_8 filter_cto
|
||||
|
||||
RELOCATION RECORDS FOR [PEIMPORT]:
|
||||
OFFSET TYPE VALUE
|
||||
|
||||
Reference in New Issue
Block a user