On 3/7/25 05:09, Philippe Mathieu-Daudé wrote:
Massage target_mmap(): calculate alignment once, then unconditionally call mmap_find_vma_aligned().Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- bsd-user/mmap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 346f2cefd32..28d7e387a20 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -489,13 +489,14 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, * before we truncate the length for mapping files below. */ if (!(flags & MAP_FIXED)) { + abi_ulong alignment = 0; + host_len = len + offset - host_offset; host_len = HOST_PAGE_ALIGN(host_len); - if ((flags & MAP_ALIGNMENT_MASK) != 0) - start = mmap_find_vma_aligned(real_start, host_len, - (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); - else - start = mmap_find_vma(real_start, host_len); + if ((flags & MAP_ALIGNMENT_MASK) != 0) { + alignment = (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT; + }
No need for the if -- (0 & mask) >> shift == 0. Otherwise, Reviewed-by: Richard Henderson <richard.hender...@linaro.org> r~
