From: Richard Henderson <richard.henderson@linaro.org>
Date: Sat, 26 Feb 2022 11:06:07 +0000 (-1000)
Subject: target/nios2: Hoist R_ZERO check in rdctl
X-Git-Tag: v7.0.0-rc0~30^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b6e8f5b234181198f4864f201bef13842987525;p=thirdparty%2Fqemu.git

target/nios2: Hoist R_ZERO check in rdctl

This will avoid having to replicate the check to additional cases.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 194c8ebafd9..fa355308a9a 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -447,11 +447,13 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags)
 
     gen_check_supervisor(dc);
 
+    if (unlikely(instr.c == R_ZERO)) {
+        return;
+    }
+
     switch (instr.imm5 + CR_BASE) {
     default:
-        if (likely(instr.c != R_ZERO)) {
-            tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]);
-        }
+        tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]);
         break;
     }
 }