Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

check-whitespace, clang-format

Browse Source 
modified:   p_elf_enum.h
	modified:   p_lx_elf.cpp
	modified:   stub/src/i386-linux.elf-so_entry.S
This commit is contained in:
John Reiser
2024-11-19 09:13:44 -08:00
parent 00706f0ccc
commit b4ea89f9d6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_elf_enum.h
+2 -2
View File
@@ -72,9 +72,9 @@ class Dummy {
ET_DYN = 3, /* Shared object file */ ET_DYN = 3, /* Shared object file */
ET_CORE = 4, /* Core file */ ET_CORE = 4, /* Core file */
}; };
enum { // e_machine enum { // e_machine
EM_NONE = 0, // No machine EM_NONE = 0, // No machine
EM_386 = 3, // i386 EM_386 = 3, // i386
EM_MIPS = 8, EM_MIPS = 8,
EM_MIPS_RS3_LE = 10, // MIPS R3000 little-endian EM_MIPS_RS3_LE = 10, // MIPS R3000 little-endian
EM_PPC = 20, EM_PPC = 20,
src/p_lx_elf.cpp
+2 -2
View File
@@ -5339,7 +5339,7 @@ unsigned PackLinuxElf32::pack2_shlib_overlay_compress(
// LOAD 0x001000 0x00001000 0x00001000 0x001d4 0x001d4 R E 0x1000 small code // LOAD 0x001000 0x00001000 0x00001000 0x001d4 0x001d4 R E 0x1000 small code
// LOAD 0x002000 0x00002000 0x00002000 0x09d40 0x09d40 R 0x1000 large app consts // LOAD 0x002000 0x00002000 0x00002000 0x09d40 0x09d40 R 0x1000 large app consts
// LOAD 0x00bef0 0x0000cef0 0x0000cef0 0x00118 0x0011c RW 0x1000 writeable // LOAD 0x00bef0 0x0000cef0 0x0000cef0 0x00118 0x0011c RW 0x1000 writeable
// //
// xct_off will have been increased artifically to point to // xct_off will have been increased artifically to point to
// the large compressable PT_LOAD (0x9d40==MemSiz), in order to avoid // the large compressable PT_LOAD (0x9d40==MemSiz), in order to avoid
// NotCompressable because the earlier PT_LOADs were too short (< 4KiB). // NotCompressable because the earlier PT_LOADs were too short (< 4KiB).
@@ -5397,7 +5397,7 @@ int PackLinuxElf32::pack2_shlib(OutputFile *fo, Filter &ft, unsigned pre_xct_top
pack2_shlib_overlay_init(fo); // set overlay_offset pack2_shlib_overlay_init(fo); // set overlay_offset
// Compressed ELF headers go first. // Compressed ELF headers go first.
pack2_shlib_overlay_write(fo, elf_buf, u_len, c_len); pack2_shlib_overlay_write(fo, elf_buf, u_len, c_len);
// The (compressible) remainder above xct_off in first PT_LOAD // The (compressible) remainder above xct_off in first PT_LOAD
if ( p_filesz >= (xct_off - p_offset)) { if ( p_filesz >= (xct_off - p_offset)) {
Extent x; Extent x;
src/stub/src/i386-linux.elf-so_entry.S
+2 -2
View File
@@ -285,7 +285,7 @@ old_mmap: // oldmmap: ebx -> 6 arguments; remove arguments on return
ret $6*4 ret $6*4
.balign 4 .balign 4
upx_mmap_and_fd: upx_mmap_and_fd:
// section UMF_LINUX or UMF_ANDROID goes here // section UMF_LINUX or UMF_ANDROID goes here
// IDENTSTR goes here // IDENTSTR goes here
@@ -307,7 +307,7 @@ uname: .globl uname
mov 2*NBPW(%ebp),%ebx mov 2*NBPW(%ebp),%ebx
movb $__NR_uname,%al; call sys_check_al movb $__NR_uname,%al; call sys_check_al
pop %ebx; pop %ebp pop %ebx; pop %ebp
ret ret
mkdir: .globl mkdir mkdir: .globl mkdir
push %ebp; mov %esp,%ebp; push %ebx push %ebp; mov %esp,%ebp; push %ebx