izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

linux-user: Remove ELF_EXEC_PAGESIZE

Browse Source 
Use TARGET_PAGE_SIZE instead.  If the target page size may vary,
using a different fixed size is wrong.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
2025-08-30 07:04:04 +10:00
parent 71cc79a4a1
commit 9f24d077f1
1 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux-user/elfload.c
+2 -30
View File
@@ -167,8 +167,6 @@ typedef abi_int target_pid_t;
#define VDSO_HEADER "vdso.c.inc"
#define ELF_EXEC_PAGESIZE 4096
#endif /* TARGET_I386 */
#ifdef TARGET_ARM
@@ -180,16 +178,12 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS32
#define EXSTACK_DEFAULT true
#define ELF_EXEC_PAGESIZE 4096
#else
/* 64 bit ARM definitions */
#define ELF_ARCH EM_AARCH64
#define ELF_CLASS ELFCLASS64
#define ELF_EXEC_PAGESIZE 4096
#if TARGET_BIG_ENDIAN
# define VDSO_HEADER "vdso-be.c.inc"
#else
@@ -258,8 +252,6 @@ typedef abi_int target_pid_t;
NEW_AUX_ENT(AT_UCACHEBSIZE, 0); \
} while (0)
#define ELF_EXEC_PAGESIZE 4096
#ifndef TARGET_PPC64
# define VDSO_HEADER "vdso-32.c.inc"
#elif TARGET_BIG_ENDIAN
@@ -280,8 +272,6 @@ typedef abi_int target_pid_t;
#define VDSO_HEADER "vdso.c.inc"
#define ELF_EXEC_PAGESIZE 4096
#endif /* TARGET_LOONGARCH64 */
#ifdef TARGET_MIPS
@@ -300,8 +290,6 @@ typedef abi_int target_pid_t;
#define elf_check_abi(x) (!((x) & EF_MIPS_ABI2))
#endif
#define ELF_EXEC_PAGESIZE 4096
#endif /* TARGET_MIPS */
#ifdef TARGET_MICROBLAZE
@@ -311,8 +299,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS32
#define ELF_ARCH EM_MICROBLAZE
#define ELF_EXEC_PAGESIZE 4096
#endif /* TARGET_MICROBLAZE */
#ifdef TARGET_OPENRISC
@@ -321,8 +307,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS32
#define ELF_DATA ELFDATA2MSB
#define ELF_EXEC_PAGESIZE 8192
#endif /* TARGET_OPENRISC */
#ifdef TARGET_SH4
@@ -330,8 +314,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS32
#define ELF_ARCH EM_SH
#define ELF_EXEC_PAGESIZE 4096
#endif
#ifdef TARGET_M68K
@@ -339,8 +321,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS32
#define ELF_ARCH EM_68K
#define ELF_EXEC_PAGESIZE 8192
#endif
#ifdef TARGET_ALPHA
@@ -348,8 +328,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS64
#define ELF_ARCH EM_ALPHA
#define ELF_EXEC_PAGESIZE 8192
#endif /* TARGET_ALPHA */
#ifdef TARGET_S390X
@@ -358,8 +336,6 @@ typedef abi_int target_pid_t;
#define ELF_DATA ELFDATA2MSB
#define ELF_ARCH EM_S390
#define ELF_EXEC_PAGESIZE 4096
#define VDSO_HEADER "vdso.c.inc"
#endif /* TARGET_S390X */
@@ -376,8 +352,6 @@ typedef abi_int target_pid_t;
#define VDSO_HEADER "vdso-64.c.inc"
#endif
#define ELF_EXEC_PAGESIZE 4096
#endif /* TARGET_RISCV */
#ifdef TARGET_HPPA
@@ -396,8 +370,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS32
#define ELF_ARCH EM_XTENSA
#define ELF_EXEC_PAGESIZE 4096
#endif /* TARGET_XTENSA */
#ifdef TARGET_HEXAGON
@@ -2697,7 +2669,7 @@ static int wmr_fill_region_phdr(void *opaque, vaddr start,
phdr->p_flags = (flags & PAGE_READ ? PF_R : 0)
| (flags & PAGE_WRITE_ORG ? PF_W : 0)
| (flags & PAGE_EXEC ? PF_X : 0);
phdr->p_align = ELF_EXEC_PAGESIZE;
phdr->p_align = TARGET_PAGE_SIZE;
bswap_phdr(phdr, 1);
d->phdr = phdr + 1;
@@ -2805,7 +2777,7 @@ static int elf_core_dump(int signr, const CPUArchState *env)
offset += size_note("CORE", sizeof(struct target_elf_prpsinfo));
offset += size_note("CORE", sizeof(struct target_elf_prstatus)) * cpus;
note_size = offset - note_offset;
data_offset = ROUND_UP(offset, ELF_EXEC_PAGESIZE);
data_offset = TARGET_PAGE_ALIGN(offset);
/* Do not dump if the corefile size exceeds the limit. */
if (dumpsize.rlim_cur != RLIM_INFINITY