[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/24] linux-user: Properly set image_info.brk in flatload
From: |
Richard Henderson |
Subject: |
[PULL 19/24] linux-user: Properly set image_info.brk in flatload |
Date: |
Sat, 5 Aug 2023 20:37:10 -0700 |
The heap starts at "brk" not "start_brk". With this fixed,
image_info.start_brk is unused and may be removed.
Tested-by: Helge Deller <deller@gmx.de>
Reviewed-by: Helge Deller <deller@gmx.de>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/qemu.h | 1 -
linux-user/flatload.c | 2 +-
linux-user/main.c | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 4b0c9da0dc..4f8b55e2fb 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -29,7 +29,6 @@ struct image_info {
abi_ulong end_code;
abi_ulong start_data;
abi_ulong end_data;
- abi_ulong start_brk;
abi_ulong brk;
abi_ulong start_mmap;
abi_ulong start_stack;
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 5efec2630e..8f5e9f489b 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -811,7 +811,7 @@ int load_flt_binary(struct linux_binprm *bprm, struct
image_info *info)
info->end_code = libinfo[0].start_code + libinfo[0].text_len;
info->start_data = libinfo[0].start_data;
info->end_data = libinfo[0].end_data;
- info->start_brk = libinfo[0].start_brk;
+ info->brk = libinfo[0].start_brk;
info->start_stack = sp;
info->stack_limit = libinfo[0].start_brk;
info->entry = start_addr;
diff --git a/linux-user/main.c b/linux-user/main.c
index cb5e80612b..96be354897 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -963,8 +963,6 @@ int main(int argc, char **argv, char **envp)
fprintf(f, "page layout changed following binary load\n");
page_dump(f);
- fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n",
- info->start_brk);
fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n",
info->end_code);
fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n",
--
2.34.1
- [PULL 09/24] linux-user: Do nothing if too small brk is specified, (continued)
- [PULL 09/24] linux-user: Do nothing if too small brk is specified, Richard Henderson, 2023/08/05
- [PULL 10/24] linux-user: Do not align brk with host page size, Richard Henderson, 2023/08/05
- [PULL 11/24] linux-user: Remove last_brk, Richard Henderson, 2023/08/05
- [PULL 12/24] bsd-user: Remove last_brk, Richard Henderson, 2023/08/05
- [PULL 13/24] linux-user: Adjust task_unmapped_base for reserved_va, Richard Henderson, 2023/08/05
- [PULL 14/24] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h, Richard Henderson, 2023/08/05
- [PULL 15/24] linux-user: Define ELF_ET_DYN_BASE in $guest/target_mman.h, Richard Henderson, 2023/08/05
- [PULL 17/24] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter, Richard Henderson, 2023/08/05
- [PULL 18/24] linux-user: Adjust initial brk when interpreter is close to executable, Richard Henderson, 2023/08/05
- [PULL 16/24] linux-user: Use MAP_FIXED_NOREPLACE for initial image mmap, Richard Henderson, 2023/08/05
- [PULL 19/24] linux-user: Properly set image_info.brk in flatload,
Richard Henderson <=
- [PULL 20/24] linux-user: Do not adjust image mapping for host page size, Richard Henderson, 2023/08/05
- [PULL 21/24] linux-user: Do not adjust zero_bss for host page size, Richard Henderson, 2023/08/05
- [PULL 22/24] linux-user: Use zero_bss for PT_LOAD with no file contents too, Richard Henderson, 2023/08/05
- [PULL 24/24] linux-user/elfload: Set V in ELF_HWCAP for RISC-V, Richard Henderson, 2023/08/05
- [PULL 23/24] accel/tcg: Call save_iotlb_data from io_readx as well., Richard Henderson, 2023/08/05
- Re: [PULL 00/24] tcg + linux-user queue for 8.1-rc3, Richard Henderson, 2023/08/06
- Failing avocado tests in CI (was: Re: [PULL 00/24] tcg + linux-user queue for 8.1-rc3), Thomas Huth, 2023/08/23