mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-04 18:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mint APE Loader 1.6

Browse source 
This change fixes a bug with loading pure bss program headers.
This commit is contained in:
Justine Tunney 2023-08-09 00:25:18 -07:00
parent c48ee8e4fe
commit 1a5ef5ba13
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
11 changed files with 87 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ape/ape.S
View file

@ -610,7 +610,7 @@ apesh: .ascii "\n@\n#'\"\n" // sixth edition shebang
// extract the loader into a temp folder, and use it to
// load the APE without modifying it.
.ascii "[ x\"$1\" != x--assimilate ] && {\n"
.ascii "t=\"${TMPDIR:-${HOME:-.}}/.ape-1.5\"\n"
.ascii "t=\"${TMPDIR:-${HOME:-.}}/.ape-1.6\"\n"
.ascii "[ -x \"$t\" ] || {\n"
.ascii "mkdir -p \"${t%/*}\" &&\n"
.ascii "dd if=\"$o\" of=\"$t.$$\" skip="
@ -818,7 +818,7 @@ ape.ident:
.long 1
1: .asciz "APE"
2: .balign 4
3: .long 105000000
3: .long 106000000
4: .size ape.ident,.-ape.ident
.type ape.ident,@object
.previous
@ -1052,11 +1052,11 @@ PEIMPS = 0b11000000000000000000000001000000
.balign __SIZEOF_POINTER__
ape_pe: .ascin "PE",4
.short kNtImageFileMachineNexgen32e
.stub ape_pe_shnum,short // NumberOfSections
.short ape_pe_shnum // NumberOfSections
.long 0x5c64126b // TimeDateStamp
.long 0 // PointerToSymbolTable
.long 0 // NumberOfSymbols
.stub ape_pe_optsz,short // SizeOfOptionalHeader
.short ape_pe_optsz // SizeOfOptionalHeader
.short PEEXE // Characteristics
.short kNtPe64bit // Optional Header Magic
.byte 14 // MajorLinkerVersion
@ -1080,25 +1080,25 @@ ape_pe: .ascin "PE",4
.long ape_pe_sizeofheaders // SizeOfHeaders
.long 0 // Checksum
.short v_ntsubsystem // Subsystem: 0=Neutral,2=GUI,3=Console
.stub v_ntdllchar,short // DllCharacteristics
.quad 0x0000000000100000 // StackReserve
.quad 0x00000000000fc000 // StackCommit
.short v_ntdllchar // DllCharacteristics
.quad ape_stack_memsz2 // StackReserve
.quad 64 * 1024 // StackCommit
.quad 0 // HeapReserve
.quad 0 // HeapCommit
.long 0 // LoaderFlags
.long 2 // NumberOfDirectoryEntries
.long 0,0 // ExportsDirectory
.stub ape_idata,long // ImportsDirectory
.stub ape_idata_idtsize,long // ImportsDirectorySize
.long ape_idata // ImportsDirectory
.long ape_idata_idtsize // ImportsDirectorySize
.endobj ape_pe,globl
.previous
.section .pe.sections,"a",@progbits
.ascin ".text",8 // Section Name
.stub ape_text_memsz,long // Virtual Size or Physical Address
.stub ape_text_rva,long // Relative Virtual Address
.stub ape_text_filesz,long // Physical Size
.stub ape_text_offset,long // Physical Offset
.long ape_text_memsz // Virtual Size or Physical Address
.long ape_text_rva // Relative Virtual Address
.long ape_text_filesz // Physical Size
.long ape_text_offset // Physical Offset
.long 0 // Relocation Table Offset
.long 0 // Line Number Table Offset
.short 0 // Relocation Count
@ -1108,10 +1108,10 @@ ape_pe: .ascin "PE",4
.section .pe.sections,"a",@progbits
.ascin ".data",8 // Section Name
.stub ape_ram_memsz,long // Virtual Size or Physical Address
.stub ape_ram_rva,long // Relative Virtual Address
.stub ape_ram_filesz,long // Physical Size
.stub ape_ram_offset,long // Physical Offset
.long ape_ram_memsz // Virtual Size or Physical Address
.long ape_ram_rva // Relative Virtual Address
.long ape_ram_filesz // Physical Size
.long ape_ram_offset // Physical Offset
.long 0 // Relocation Table Offset
.long 0 // Line Number Table Offset
.short 0 // Relocation Count