target/riscv: Fix coding style on "G" expansion

Because ext_? members are boolean variables, operator `&&' should be
used instead of `&'.

Signed-off-by: Tsukasa OI <[email protected]>
Reviewed-by: Alistair Francis <[email protected]>
Reviewed-by: Víctor Colombo <[email protected]>
Message-Id: <91633f8349253656dd08bc8dc36498a9c7538b10.1652583332[email protected]>
Signed-off-by: Alistair Francis <[email protected]>

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index dc93412395d022f68224cf2fb4f750bfc3365071..e439716337e953c4ba24af85faee9413df5e362a 100644 (file)
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -596,8 +596,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)
             return;
         }
 
-        if (cpu->cfg.ext_g && !(cpu->cfg.ext_i & cpu->cfg.ext_m &
-                                cpu->cfg.ext_a & cpu->cfg.ext_f &
+        if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m &&
+                                cpu->cfg.ext_a && cpu->cfg.ext_f &&
                                 cpu->cfg.ext_d)) {
             warn_report("Setting G will also set IMAFD");
             cpu->cfg.ext_i = true;