[v4,39/40] target/arm: Use bool for unmasked in arm_excp_unmasked

Message ID 20191203022937.1474-40-richard.henderson@linaro.org
State Superseded
Headers show
Series
  • target/arm: Implement ARMv8.1-VHE
Related show

Commit Message

Richard Henderson Dec. 3, 2019, 2:29 a.m.
The value computed is fully boolean; using int8_t is odd.

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

---
 target/arm/cpu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.17.1

Comments

Philippe Mathieu-Daudé Dec. 3, 2019, 6:30 a.m. | #1
On 12/3/19 3:29 AM, Richard Henderson wrote:
> The value computed is fully boolean; using int8_t is odd.

> 

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


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


> ---

>   target/arm/cpu.c | 6 +++---

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

> 

> diff --git a/target/arm/cpu.c b/target/arm/cpu.c

> index 7a1177b883..a366448c6d 100644

> --- a/target/arm/cpu.c

> +++ b/target/arm/cpu.c

> @@ -417,7 +417,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,

>   {

>       CPUARMState *env = cs->env_ptr;

>       bool pstate_unmasked;

> -    int8_t unmasked = 0;

> +    bool unmasked = false;

>   

>       /*

>        * Don't take exceptions if they target a lower EL.

> @@ -468,7 +468,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,

>                * don't affect the masking logic, only the interrupt routing.

>                */

>               if (target_el == 3 || !secure) {

> -                unmasked = 1;

> +                unmasked = true;

>               }

>           } else {

>               /*

> @@ -514,7 +514,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,

>               }

>   

>               if ((scr || hcr) && !secure) {

> -                unmasked = 1;

> +                unmasked = true;

>               }

>           }

>       }

>

Patch

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 7a1177b883..a366448c6d 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -417,7 +417,7 @@  static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
 {
     CPUARMState *env = cs->env_ptr;
     bool pstate_unmasked;
-    int8_t unmasked = 0;
+    bool unmasked = false;
 
     /*
      * Don't take exceptions if they target a lower EL.
@@ -468,7 +468,7 @@  static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
              * don't affect the masking logic, only the interrupt routing.
              */
             if (target_el == 3 || !secure) {
-                unmasked = 1;
+                unmasked = true;
             }
         } else {
             /*
@@ -514,7 +514,7 @@  static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
             }
 
             if ((scr || hcr) && !secure) {
-                unmasked = 1;
+                unmasked = true;
             }
         }
     }