PowerPC stub unified with i386; including escape hatch [munmap all extras]

modified:   stub/src/i386-linux.elf-main.c
	modified:   stub/src/powerpc-linux.elf-entry.S
	modified:   stub/src/powerpc-linux.elf-fold.S
	modified:   stub/src/powerpc-linux.elf-main.c
	modified:   ../.github/travis_testsuite_1.sh

	{arm.*,i386,mips*.r3000,powerpc}-linux.elf-fold.{h,map}
	powerpc-*-entry.*
This commit is contained in:
John Reiser
2017-06-24 18:37:16 -07:00
parent 9f20bbb046
commit 3bf387a2d4
21 changed files with 1710 additions and 2065 deletions
+9 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xa88
.text 0x0000000000008080 0xa68
*(.text)
.text 0x0000000000008080 0x324 tmp/arm.v4a-linux.elf-fold.o
0x00000000000082e8 munmap
@@ -29,17 +29,18 @@ TARGET(elf32-littlearm)
0x0000000000008348 div10
0x00000000000082f0 mprotect
0x00000000000082c0 close
.text 0x00000000000083a4 0x764 tmp/arm.v4a-linux.elf-main.o
0x0000000000008934 upx_main
.text 0x00000000000083a4 0x744 tmp/arm.v4a-linux.elf-main.o
0x00000000000083c4 get_page_mask
0x0000000000008918 upx_main
*(.data)
.data 0x0000000000008b08 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008b08 0x0 tmp/arm.v4a-linux.elf-main.o
.data 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-main.o
.data
.bss 0x0000000000008b08 0x0
.bss 0x0000000000008b08 0x0 tmp/arm.v4a-linux.elf-fold.o
.bss 0x0000000000008b08 0x0 tmp/arm.v4a-linux.elf-main.o
.bss 0x0000000000008ae8 0x0
.bss 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-fold.o
.bss 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-main.o
LOAD tmp/arm.v4a-linux.elf-fold.o
LOAD tmp/arm.v4a-linux.elf-main.o
OUTPUT(tmp/arm.v4a-linux.elf-fold.bin elf32-littlearm)
+9 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xb24
.text 0x0000000000008080 0xb04
*(.text)
.text 0x0000000000008080 0x3c4 tmp/arm.v5a-linux.elf-fold.o
0x0000000000008354 munmap
@@ -29,17 +29,18 @@ TARGET(elf32-littlearm)
0x00000000000083e8 div10
0x0000000000008368 mprotect
0x00000000000082f0 close
.text 0x0000000000008444 0x760 tmp/armel-linux.elf-main.o
0x00000000000089d0 upx_main
.text 0x0000000000008444 0x740 tmp/armel-linux.elf-main.o
0x0000000000008464 get_page_mask
0x00000000000089b4 upx_main
*(.data)
.data 0x0000000000008ba4 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008ba4 0x0 tmp/armel-linux.elf-main.o
.data 0x0000000000008b84 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008b84 0x0 tmp/armel-linux.elf-main.o
.data
.bss 0x0000000000008ba4 0x0
.bss 0x0000000000008ba4 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008ba4 0x0 tmp/armel-linux.elf-main.o
.bss 0x0000000000008b84 0x0
.bss 0x0000000000008b84 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008b84 0x0 tmp/armel-linux.elf-main.o
LOAD tmp/arm.v5a-linux.elf-fold.o
LOAD tmp/armel-linux.elf-main.o
OUTPUT(tmp/arm.v5a-linux.elf-fold.bin elf32-littlearm)
+9 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-bigarm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xa88
.text 0x0000000000008080 0xa68
*(.text)
.text 0x0000000000008080 0x324 tmp/armeb.v4a-linux.elf-fold.o
0x00000000000082e8 munmap
@@ -29,17 +29,18 @@ TARGET(elf32-bigarm)
0x0000000000008348 div10
0x00000000000082f0 mprotect
0x00000000000082c0 close
.text 0x00000000000083a4 0x764 tmp/armeb.v4a-linux.elf-main.o
0x0000000000008934 upx_main
.text 0x00000000000083a4 0x744 tmp/armeb.v4a-linux.elf-main.o
0x00000000000083c4 get_page_mask
0x0000000000008918 upx_main
*(.data)
.data 0x0000000000008b08 0x0 tmp/armeb.v4a-linux.elf-fold.o
.data 0x0000000000008b08 0x0 tmp/armeb.v4a-linux.elf-main.o
.data 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-fold.o
.data 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-main.o
.data
.bss 0x0000000000008b08 0x0
.bss 0x0000000000008b08 0x0 tmp/armeb.v4a-linux.elf-fold.o
.bss 0x0000000000008b08 0x0 tmp/armeb.v4a-linux.elf-main.o
.bss 0x0000000000008ae8 0x0
.bss 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-fold.o
.bss 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-main.o
LOAD tmp/armeb.v4a-linux.elf-fold.o
LOAD tmp/armeb.v4a-linux.elf-main.o
OUTPUT(tmp/armeb.v4a-linux.elf-fold.bin elf32-bigarm)
+11 -9
View File
@@ -9,23 +9,25 @@ Linker script and memory map
TARGET(elf32-i386)
0x0000000000c01080 . = ((0xc01000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000c01080 0x6f8
.text 0x0000000000c01080 0x6d8
*(.text)
.text 0x0000000000c01080 0x154 tmp/i386-linux.elf-fold.o
0x0000000000c011a5 mmap
.text 0x0000000000c011d4 0x5a4 tmp/i386-linux.elf-main.o
0x0000000000c01600 upx_main
.text 0x0000000000c011d4 0x583 tmp/i386-linux.elf-main.o
0x0000000000c012fc get_page_mask
0x0000000000c015e4 upx_main
*(.data)
.data 0x0000000000c01778 0x0 tmp/i386-linux.elf-fold.o
.data 0x0000000000c01778 0x0 tmp/i386-linux.elf-main.o
*fill* 0x0000000000c01757 0x1 00
.data 0x0000000000c01758 0x0 tmp/i386-linux.elf-fold.o
.data 0x0000000000c01758 0x0 tmp/i386-linux.elf-main.o
.data
.bss 0x0000000000c01778 0x0
.bss 0x0000000000c01778 0x0 tmp/i386-linux.elf-fold.o
.bss 0x0000000000c01778 0x0 tmp/i386-linux.elf-main.o
.bss 0x0000000000c01758 0x0
.bss 0x0000000000c01758 0x0 tmp/i386-linux.elf-fold.o
.bss 0x0000000000c01758 0x0 tmp/i386-linux.elf-main.o
.rel.dyn 0x0000000000c01778 0x0
.rel.dyn 0x0000000000c01758 0x0
.rel.text 0x0000000000000000 0x0 tmp/i386-linux.elf-fold.o
LOAD tmp/i386-linux.elf-fold.o
LOAD tmp/i386-linux.elf-main.o
+9 -8
View File
@@ -9,20 +9,21 @@ Linker script and memory map
TARGET(elf32-bigmips)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0xa80
.text 0x0000000000100080 0x9c0
*(.text)
.text 0x0000000000100080 0x120 tmp/mips.r3000-linux.elf-fold.o
.text 0x00000000001001a0 0x960 tmp/mips.r3000-linux.elf-main.o
0x00000000001008cc upx_main
.text 0x00000000001001a0 0x8a0 tmp/mips.r3000-linux.elf-main.o
0x0000000000100414 get_page_mask
0x0000000000100810 upx_main
*(.data)
.data 0x0000000000100b00 0x0 tmp/mips.r3000-linux.elf-fold.o
.data 0x0000000000100b00 0x0 tmp/mips.r3000-linux.elf-main.o
.data 0x0000000000100a40 0x0 tmp/mips.r3000-linux.elf-fold.o
.data 0x0000000000100a40 0x0 tmp/mips.r3000-linux.elf-main.o
.data
.bss 0x0000000000100b00 0x0
.bss 0x0000000000100b00 0x0 tmp/mips.r3000-linux.elf-fold.o
.bss 0x0000000000100b00 0x0 tmp/mips.r3000-linux.elf-main.o
.bss 0x0000000000100a40 0x0
.bss 0x0000000000100a40 0x0 tmp/mips.r3000-linux.elf-fold.o
.bss 0x0000000000100a40 0x0 tmp/mips.r3000-linux.elf-main.o
LOAD tmp/mips.r3000-linux.elf-fold.o
LOAD tmp/mips.r3000-linux.elf-main.o
OUTPUT(tmp/mips.r3000-linux.elf-fold.bin elf32-bigmips)
+9 -8
View File
@@ -9,20 +9,21 @@ Linker script and memory map
TARGET(elf32-littlemips)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0xa80
.text 0x0000000000100080 0x9c0
*(.text)
.text 0x0000000000100080 0x120 tmp/mipsel.r3000-linux.elf-fold.o
.text 0x00000000001001a0 0x960 tmp/mipsel.r3000-linux.elf-main.o
0x00000000001008cc upx_main
.text 0x00000000001001a0 0x8a0 tmp/mipsel.r3000-linux.elf-main.o
0x0000000000100414 get_page_mask
0x0000000000100810 upx_main
*(.data)
.data 0x0000000000100b00 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.data 0x0000000000100b00 0x0 tmp/mipsel.r3000-linux.elf-main.o
.data 0x0000000000100a40 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.data 0x0000000000100a40 0x0 tmp/mipsel.r3000-linux.elf-main.o
.data
.bss 0x0000000000100b00 0x0
.bss 0x0000000000100b00 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.bss 0x0000000000100b00 0x0 tmp/mipsel.r3000-linux.elf-main.o
.bss 0x0000000000100a40 0x0
.bss 0x0000000000100a40 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.bss 0x0000000000100a40 0x0 tmp/mipsel.r3000-linux.elf-main.o
LOAD tmp/mipsel.r3000-linux.elf-fold.o
LOAD tmp/mipsel.r3000-linux.elf-main.o
OUTPUT(tmp/mipsel.r3000-linux.elf-fold.bin elf32-littlemips)
@@ -14,7 +14,7 @@ Idx Name Size VMA LMA File off Algn Flags
9 NRV_TAIL 0000001c 00000000 00000000 00001788 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 00000000 00000000 000017a4 2**0 CONTENTS, READONLY
11 ELFMAINY 00000022 00000000 00000000 000017c8 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZ 0000013c 00000000 00000000 000017ea 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZ 000001f8 00000000 00000000 000017ea 2**0 CONTENTS, RELOC, READONLY
SYMBOL TABLE:
00000000 l d LZMA_DEC30 00000000 LZMA_DEC30
00000000 l d NRV_TAIL 00000000 NRV_TAIL
@@ -37,7 +37,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR [ELFMAINX]:
OFFSET TYPE VALUE
00000000 R_PPC_REL24 ELFMAINZ+0x0000011c
00000000 R_PPC_REL24 ELFMAINZ+0x000001a4
RELOCATION RECORDS FOR [NRV2E]:
OFFSET TYPE VALUE
@@ -61,8 +61,9 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR [ELFMAINZ]:
OFFSET TYPE VALUE
000000ac R_PPC_REL14 ELFMAINY
0000012c R_PPC_ADDR32 ADRM
00000130 R_PPC_ADDR32 LENM
00000134 R_PPC_ADDR32 LENU
00000138 R_PPC_ADDR32 O_BINFO
0000007c R_PPC_REL14 ELFMAINY
00000104 R_PPC_REL14 ELFMAINY
000001e8 R_PPC_ADDR32 ADRM
000001ec R_PPC_ADDR32 LENM
000001f0 R_PPC_ADDR32 LENU
000001f4 R_PPC_ADDR32 O_BINFO
+22 -19
View File
@@ -9,31 +9,34 @@ Linker script and memory map
TARGET(elf32-powerpc)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0xee4
.text 0x0000000000100080 0x10dc
*(.text)
.text 0x0000000000100080 0x24c tmp/powerpc-linux.elf-fold.o
0x00000000001002bc munmap
0x0000000000100294 readlink
0x0000000000100278 mmap
0x000000000010029c read
0x000000000010028c exit
0x00000000001002c4 brk
0x00000000001002a4 open
0x00000000001002b4 mprotect
0x00000000001002ac close
.text 0x00000000001002cc 0xc98 tmp/powerpc-linux.elf-main.o
0x0000000000100c40 upx_main
.text 0x0000000000100080 0x264 tmp/powerpc-linux.elf-fold.o
0x0000000000100080 get_page_mask
0x00000000001002cc munmap
0x000000000010029c readlink
0x0000000000100280 mmap
0x00000000001002a4 write
0x00000000001002ac read
0x00000000001002dc my_bkpt
0x0000000000100294 exit
0x00000000001002d4 brk
0x00000000001002b4 open
0x00000000001002c4 mprotect
0x00000000001002bc close
.text 0x00000000001002e4 0xe78 tmp/powerpc-linux.elf-main.o
0x0000000000100e48 upx_main
*(.data)
.data 0x0000000000100f64 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000100f64 0x0 tmp/powerpc-linux.elf-main.o
.data 0x000000000010115c 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x000000000010115c 0x0 tmp/powerpc-linux.elf-main.o
.data
.bss 0x0000000000100f64 0x0
.bss 0x0000000000100f64 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000100f64 0x0 tmp/powerpc-linux.elf-main.o
.bss 0x000000000010115c 0x0
.bss 0x000000000010115c 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x000000000010115c 0x0 tmp/powerpc-linux.elf-main.o
.rela.dyn 0x0000000000100f64 0x0
.rela.dyn 0x000000000010115c 0x0
.rela.text 0x0000000000000000 0x0 tmp/powerpc-linux.elf-fold.o
LOAD tmp/powerpc-linux.elf-fold.o
LOAD tmp/powerpc-linux.elf-main.o