mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Detabified.

Browse Source 
committer: mfx <mfx> 1089685145 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2004-07-13 02:19:05 +00:00
parent f41edf9e21
commit befaa3c501
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/stub/l_lx_elf.c
View File

@ -258,18 +258,18 @@ xfind_pages(unsigned mflags, Elf32_Phdr const *phdr, int phnum,
char **const p_brk char **const p_brk
) )
{ {
size_t lo= ~0, hi= 0, szlo= 0; size_t lo= ~0, hi= 0, szlo= 0;
char *addr; char *addr;
mflags += MAP_PRIVATE | MAP_ANONYMOUS; // '+' can optimize better than '|' mflags += MAP_PRIVATE | MAP_ANONYMOUS; // '+' can optimize better than '|'
for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) { for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) {
if (phdr->p_vaddr < lo) { if (phdr->p_vaddr < lo) {
lo = phdr->p_vaddr; lo = phdr->p_vaddr;
szlo = phdr->p_filesz; szlo = phdr->p_filesz;
} }
if (hi < (phdr->p_memsz + phdr->p_vaddr)) { if (hi < (phdr->p_memsz + phdr->p_vaddr)) {
hi = phdr->p_memsz + phdr->p_vaddr; hi = phdr->p_memsz + phdr->p_vaddr;
} }
} }
szlo += ~PAGE_MASK & lo; // page fragment on lo edge szlo += ~PAGE_MASK & lo; // page fragment on lo edge
lo -= ~PAGE_MASK & lo; // round down to page boundary lo -= ~PAGE_MASK & lo; // round down to page boundary
hi = PAGE_MASK & (hi - lo - PAGE_MASK -1); // page length hi = PAGE_MASK & (hi - lo - PAGE_MASK -1); // page length

18
src/stub/l_lx_sh.c
View File

@ -186,18 +186,18 @@ static unsigned long // returns relocation constant
__attribute__((regparm(3), stdcall)) __attribute__((regparm(3), stdcall))
xfind_pages(unsigned mflags, Elf32_Phdr const *phdr, int phnum) xfind_pages(unsigned mflags, Elf32_Phdr const *phdr, int phnum)
{ {
size_t lo= ~0, hi= 0, szlo= 0; size_t lo= ~0, hi= 0, szlo= 0;
char *addr; char *addr;
mflags += MAP_PRIVATE | MAP_ANONYMOUS; // '+' can optimize better than '|' mflags += MAP_PRIVATE | MAP_ANONYMOUS; // '+' can optimize better than '|'
for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) { for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) {
if (phdr->p_vaddr < lo) { if (phdr->p_vaddr < lo) {
lo = phdr->p_vaddr; lo = phdr->p_vaddr;
szlo = phdr->p_filesz; szlo = phdr->p_filesz;
} }
if (hi < (phdr->p_memsz + phdr->p_vaddr)) { if (hi < (phdr->p_memsz + phdr->p_vaddr)) {
hi = phdr->p_memsz + phdr->p_vaddr; hi = phdr->p_memsz + phdr->p_vaddr;
} }
} }
if (MAP_FIXED & mflags) { // the "shell", and not the PT_INTERP if (MAP_FIXED & mflags) { // the "shell", and not the PT_INTERP
// This is a dirty hack to set the proper value for brk(0) as seen by // This is a dirty hack to set the proper value for brk(0) as seen by
// the "shell" which we will mmap() soon, upon return to do_xmap(). // the "shell" which we will mmap() soon, upon return to do_xmap().