[Qemu-devel] [PATCH] target-tricore: Fix check which was always false

[Qemu-devel] [PATCH] target-tricore: Fix check which was always false

[Stefan Weil]

With a mask value of 0x00400000, the result will never be 1.
This fixes a Coverity warning.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-tricore/op_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index 0e7b4e8..b7d18b2 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -2593,7 +2593,7 @@ void helper_rslcx(CPUTriCoreState *env)
         /* CSU trap */
     }
     /* if (PCXI.UL == 1) then trap(CTYP); */
-    if ((env->PCXI & MASK_PCXI_UL) == 1) {
+    if ((env->PCXI & MASK_PCXI_UL) != 0) {
         /* CTYP trap */
     }
     /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */
-- 
2.1.4

Re: [Qemu-devel] [PATCH] target-tricore: Fix check which was always false

[Bastian Koppelmann]

Hi mjt,

On 03/21/2015 02:44 PM, Stefan Weil wrote:
> With a mask value of 0x00400000, the result will never be 1.
> This fixes a Coverity warning.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>   target-tricore/op_helper.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
> index 0e7b4e8..b7d18b2 100644
> --- a/target-tricore/op_helper.c
> +++ b/target-tricore/op_helper.c
> @@ -2593,7 +2593,7 @@ void helper_rslcx(CPUTriCoreState *env)
>           /* CSU trap */
>       }
>       /* if (PCXI.UL == 1) then trap(CTYP); */
> -    if ((env->PCXI & MASK_PCXI_UL) == 1) {
> +    if ((env->PCXI & MASK_PCXI_UL) != 0) {
>           /* CTYP trap */
>       }
>       /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */

are you picking this one up? It looks good to me.

Cheers,
Bastian

Re: [Qemu-devel] [PATCH] target-tricore: Fix check which was always false

[Michael Tokarev]

21.03.2015 16:44, Stefan Weil wrote:
> With a mask value of 0x00400000, the result will never be 1.
> This fixes a Coverity warning.

Might be a bit risky if the whole thing wasn't a complete no-op.
I wonder maybe the whole this if statement should be removed..

But anyway, applied to -trivial, thank you!

/mjt

> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  target-tricore/op_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
> index 0e7b4e8..b7d18b2 100644
> --- a/target-tricore/op_helper.c
> +++ b/target-tricore/op_helper.c
> @@ -2593,7 +2593,7 @@ void helper_rslcx(CPUTriCoreState *env)
>          /* CSU trap */
>      }
>      /* if (PCXI.UL == 1) then trap(CTYP); */
> -    if ((env->PCXI & MASK_PCXI_UL) == 1) {
> +    if ((env->PCXI & MASK_PCXI_UL) != 0) {
>          /* CTYP trap */
>      }
>      /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */
> 

Re: [Qemu-devel] [PATCH] target-tricore: Fix check which was always false

[Bastian Koppelmann]

On 03/25/2015 04:20 PM, Michael Tokarev wrote:
> 21.03.2015 16:44, Stefan Weil wrote:
>> With a mask value of 0x00400000, the result will never be 1.
>> This fixes a Coverity warning.
> Might be a bit risky if the whole thing wasn't a complete no-op.
> I wonder maybe the whole this if statement should be removed..
>
> But anyway, applied to -trivial, thank you!
>
> /mjt
>
Thanks. The statement is just an indicator for a trap which needs to 
happen there. I'm working on this right now, so it won't stay like this 
for long :).

Cheers,
Bastian