diff mbox series

[v10,4/8] linux-user/elfload: Fix coding style in load_elf_image

Message ID 20201002215955.254866-5-richard.henderson@linaro.org
State Superseded
Headers show
Series linux-user: User support for AArch64 BTI | expand

Commit Message

Richard Henderson Oct. 2, 2020, 9:59 p.m. UTC 
Fixing this now will clarify following patches.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/elfload.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 3, 2020, 5:34 p.m. UTC | #1 
On 10/2/20 11:59 PM, Richard Henderson wrote:
> Fixing this now will clarify following patches.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


> ---

>  linux-user/elfload.c | 12 +++++++++---

>  1 file changed, 9 insertions(+), 3 deletions(-)

> 

> diff --git a/linux-user/elfload.c b/linux-user/elfload.c

> index f6022fd704..7572a32a30 100644

> --- a/linux-user/elfload.c

> +++ b/linux-user/elfload.c

> @@ -2531,9 +2531,15 @@ static void load_elf_image(const char *image_name, int image_fd,

>              abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em, vaddr_len;

>              int elf_prot = 0;

>  

> -            if (eppnt->p_flags & PF_R) elf_prot =  PROT_READ;

> -            if (eppnt->p_flags & PF_W) elf_prot |= PROT_WRITE;

> -            if (eppnt->p_flags & PF_X) elf_prot |= PROT_EXEC;

> +            if (eppnt->p_flags & PF_R) {

> +                elf_prot |= PROT_READ;

> +            }

> +            if (eppnt->p_flags & PF_W) {

> +                elf_prot |= PROT_WRITE;

> +            }

> +            if (eppnt->p_flags & PF_X) {

> +                elf_prot |= PROT_EXEC;

> +            }

>  

>              vaddr = load_bias + eppnt->p_vaddr;

>              vaddr_po = TARGET_ELF_PAGEOFFSET(vaddr);

>
Peter Maydell Oct. 8, 2020, 1:03 p.m. UTC | #2 
On Fri, 2 Oct 2020 at 23:00, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Fixing this now will clarify following patches.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/elfload.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
diff mbox series

Patch

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index f6022fd704..7572a32a30 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2531,9 +2531,15 @@  static void load_elf_image(const char *image_name, int image_fd,
             abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em, vaddr_len;
             int elf_prot = 0;
 
-            if (eppnt->p_flags & PF_R) elf_prot =  PROT_READ;
-            if (eppnt->p_flags & PF_W) elf_prot |= PROT_WRITE;
-            if (eppnt->p_flags & PF_X) elf_prot |= PROT_EXEC;
+            if (eppnt->p_flags & PF_R) {
+                elf_prot |= PROT_READ;
+            }
+            if (eppnt->p_flags & PF_W) {
+                elf_prot |= PROT_WRITE;
+            }
+            if (eppnt->p_flags & PF_X) {
+                elf_prot |= PROT_EXEC;
+            }
 
             vaddr = load_bias + eppnt->p_vaddr;
             vaddr_po = TARGET_ELF_PAGEOFFSET(vaddr);