[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 14/14] linux-user: Properly set image_info.brk in flatload
From: |
Richard Henderson |
Subject: |
[PATCH v7 14/14] linux-user: Properly set image_info.brk in flatload |
Date: |
Wed, 2 Aug 2023 18:53:02 -0700 |
The heap starts at "brk" not "start_brk". With this fixed,
image_info.start_brk is unused and may be removed.
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 2b6f3f22c7..c393a2ceb6 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -961,8 +961,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
- [PATCH v7 04/14] linux-user: Use MAP_FIXED_NOREPLACE for do_brk(), (continued)
- [PATCH v7 04/14] linux-user: Use MAP_FIXED_NOREPLACE for do_brk(), Richard Henderson, 2023/08/02
- [PATCH v7 07/14] linux-user: Remove last_brk, Richard Henderson, 2023/08/02
- [PATCH v7 08/14] bsd-user: Remove last_brk, Richard Henderson, 2023/08/02
- [PATCH v7 09/14] linux-user: Adjust task_unmapped_base for reserved_va, Richard Henderson, 2023/08/02
- [PATCH v7 06/14] linux-user: Do not align brk with host page size, Richard Henderson, 2023/08/02
- [PATCH v7 10/14] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h, Richard Henderson, 2023/08/02
- [PATCH v7 11/14] linux-user: Add ELF_ET_DYN_BASE, Richard Henderson, 2023/08/02
- [PATCH v7 13/14] linux-user: Adjust initial brk when interpreter is close to executable, Richard Henderson, 2023/08/02
- [PATCH v7 12/14] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter, Richard Henderson, 2023/08/02
- [PATCH v7 14/14] linux-user: Properly set image_info.brk in flatload,
Richard Henderson <=
- Re: [PATCH v7 00/14] linux-user: brk fixes, Joel Stanley, 2023/08/03