On Fri, Aug 18, 2023 at 11:57 AM Richard Henderson <
richard.hender...@linaro.org> wrote:
> The start_mmap value is write-only.
> Remove the field and the defines that populated it.
>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
This one won't interfere with anything, but unless I hear otherwise, I'll
queue it.
It applies to the blitz branch (though it needs a few more targets there),
and none
of these files are being modified by Kariim Taha, my gsoc student.
Warner
> ---
> bsd-user/arm/target_arch_elf.h | 1 -
> bsd-user/i386/target_arch_elf.h | 1 -
> bsd-user/qemu.h | 1 -
> bsd-user/x86_64/target_arch_elf.h | 1 -
> bsd-user/elfload.c | 1 -
> 5 files changed, 5 deletions(-)
>
> diff --git a/bsd-user/arm/target_arch_elf.h
> b/bsd-user/arm/target_arch_elf.h
> index 935bce347f..b1c0fd2b32 100644
> --- a/bsd-user/arm/target_arch_elf.h
> +++ b/bsd-user/arm/target_arch_elf.h
> @@ -20,7 +20,6 @@
> #ifndef TARGET_ARCH_ELF_H
> #define TARGET_ARCH_ELF_H
>
> -#define ELF_START_MMAP 0x80000000
> #define ELF_ET_DYN_LOAD_ADDR 0x500000
>
> #define elf_check_arch(x) ((x) == EM_ARM)
> diff --git a/bsd-user/i386/target_arch_elf.h
> b/bsd-user/i386/target_arch_elf.h
> index cbcd1f08e2..4ac27b02e7 100644
> --- a/bsd-user/i386/target_arch_elf.h
> +++ b/bsd-user/i386/target_arch_elf.h
> @@ -20,7 +20,6 @@
> #ifndef TARGET_ARCH_ELF_H
> #define TARGET_ARCH_ELF_H
>
> -#define ELF_START_MMAP 0x80000000
> #define ELF_ET_DYN_LOAD_ADDR 0x01001000
> #define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
>
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 8f2d6a3c78..178114b423 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -52,7 +52,6 @@ struct image_info {
> abi_ulong end_data;
> abi_ulong start_brk;
> abi_ulong brk;
> - abi_ulong start_mmap;
> abi_ulong mmap;
> abi_ulong rss;
> abi_ulong start_stack;
> diff --git a/bsd-user/x86_64/target_arch_elf.h
> b/bsd-user/x86_64/target_arch_elf.h
> index b244711888..e51c2faf08 100644
> --- a/bsd-user/x86_64/target_arch_elf.h
> +++ b/bsd-user/x86_64/target_arch_elf.h
> @@ -20,7 +20,6 @@
> #ifndef TARGET_ARCH_ELF_H
> #define TARGET_ARCH_ELF_H
>
> -#define ELF_START_MMAP 0x2aaaaab000ULL
> #define ELF_ET_DYN_LOAD_ADDR 0x01021000
> #define elf_check_arch(x) (((x) == ELF_ARCH))
>
> diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
> index 1f650bdde8..38a3439d2c 100644
> --- a/bsd-user/elfload.c
> +++ b/bsd-user/elfload.c
> @@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
> target_pt_regs *regs,
> /* OK, This is the point of no return */
> info->end_data = 0;
> info->end_code = 0;
> - info->start_mmap = (abi_ulong)ELF_START_MMAP;
> info->mmap = 0;
> elf_entry = (abi_ulong) elf_ex.e_entry;
>
> --
> 2.34.1
>
>
