diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-08-02 16:25:37 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-08-06 16:46:13 -0700 |
| commit | 0662a626a712dde5f8a91e1b078644332336e9fa (patch) | |
| tree | 3e8cc755bf74afb10dba660195e8214774e2f343 | |
| parent | 2aea137a425a87b930a33590177b04368fd7cc12 (diff) | |
| download | focaccia-qemu-0662a626a712dde5f8a91e1b078644332336e9fa.tar.gz focaccia-qemu-0662a626a712dde5f8a91e1b078644332336e9fa.zip | |
linux-user: Properly set image_info.brk in flatload
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>
| -rw-r--r-- | linux-user/flatload.c | 2 | ||||
| -rw-r--r-- | linux-user/main.c | 2 | ||||
| -rw-r--r-- | linux-user/qemu.h | 1 |
3 files changed, 1 insertions, 4 deletions
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 dba67ffa36..556956c363 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -920,8 +920,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", diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 802794db63..2046a23037 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 reserve_brk; abi_ulong start_mmap; |