mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
linux-user: Do not adjust image mapping for host page size
Remove TARGET_ELF_EXEC_PAGESIZE, and 3 other TARGET_ELF_PAGE* macros based off of that. Rely on target_mmap to handle guest vs host page size mismatch. Tested-by: Helge Deller <deller@gmx.de> Reviewed-by: Helge Deller <deller@gmx.de> Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
1f356e8c01
commit
e3d97d5c5d
|
@ -1960,15 +1960,6 @@ struct exec
|
|||
#define ZMAGIC 0413
|
||||
#define QMAGIC 0314
|
||||
|
||||
/* Necessary parameters */
|
||||
#define TARGET_ELF_EXEC_PAGESIZE \
|
||||
(((eppnt->p_align & ~qemu_host_page_mask) != 0) ? \
|
||||
TARGET_PAGE_SIZE : MAX(qemu_host_page_size, TARGET_PAGE_SIZE))
|
||||
#define TARGET_ELF_PAGELENGTH(_v) ROUND_UP((_v), TARGET_ELF_EXEC_PAGESIZE)
|
||||
#define TARGET_ELF_PAGESTART(_v) ((_v) & \
|
||||
~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1))
|
||||
#define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1))
|
||||
|
||||
#define DLINFO_ITEMS 16
|
||||
|
||||
static inline void memcpy_fromfs(void * to, const void * from, unsigned long n)
|
||||
|
@ -3241,8 +3232,8 @@ static void load_elf_image(const char *image_name, int image_fd,
|
|||
}
|
||||
|
||||
vaddr = load_bias + eppnt->p_vaddr;
|
||||
vaddr_po = TARGET_ELF_PAGEOFFSET(vaddr);
|
||||
vaddr_ps = TARGET_ELF_PAGESTART(vaddr);
|
||||
vaddr_po = vaddr & ~TARGET_PAGE_MASK;
|
||||
vaddr_ps = vaddr & TARGET_PAGE_MASK;
|
||||
|
||||
vaddr_ef = vaddr + eppnt->p_filesz;
|
||||
vaddr_em = vaddr + eppnt->p_memsz;
|
||||
|
@ -3252,7 +3243,7 @@ static void load_elf_image(const char *image_name, int image_fd,
|
|||
* but no backing file segment.
|
||||
*/
|
||||
if (eppnt->p_filesz != 0) {
|
||||
vaddr_len = TARGET_ELF_PAGELENGTH(eppnt->p_filesz + vaddr_po);
|
||||
vaddr_len = eppnt->p_filesz + vaddr_po;
|
||||
error = target_mmap(vaddr_ps, vaddr_len, elf_prot,
|
||||
MAP_PRIVATE | MAP_FIXED,
|
||||
image_fd, eppnt->p_offset - vaddr_po);
|
||||
|
@ -3268,7 +3259,7 @@ static void load_elf_image(const char *image_name, int image_fd,
|
|||
zero_bss(vaddr_ef, vaddr_em, elf_prot);
|
||||
}
|
||||
} else if (eppnt->p_memsz != 0) {
|
||||
vaddr_len = TARGET_ELF_PAGELENGTH(eppnt->p_memsz + vaddr_po);
|
||||
vaddr_len = eppnt->p_memsz + vaddr_po;
|
||||
error = target_mmap(vaddr_ps, vaddr_len, elf_prot,
|
||||
MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS,
|
||||
-1, 0);
|
||||
|
|
Loading…
Reference in a new issue