]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
target/mips: Fix two instances of shadow variables
authorAleksandar Markovic <amarkovic@wavecomp.com>
Thu, 2 Aug 2018 14:15:51 +0000 (16:15 +0200)
committerAleksandar Markovic <amarkovic@wavecomp.com>
Thu, 16 Aug 2018 17:18:45 +0000 (19:18 +0200)
Fix two instances of shadow variables. This cleans up entire file
translate.c from shadow variables.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Stefan Markovic <smarkovic@wavecomp.com>
target/mips/translate.c

index 3dd66b6267bc877f77f70bf81ed435bd52445fec..2b70d1b7c35fbc977391f400867763ddd8f1f134 100644 (file)
@@ -13276,7 +13276,7 @@ static void gen_pool16c_r6_insn(DisasContext *ctx)
             gen_arith_imm(ctx, OPC_ADDIU, 29, 29, imm << 2);
         } else {
             /* JRC16 */
-            int rs = extract32(ctx->opcode, 5, 5);
+            rs = extract32(ctx->opcode, 5, 5);
             gen_compute_branch(ctx, OPC_JR, 2, rs, 0, 0, 0);
         }
         break;
@@ -15298,7 +15298,7 @@ static void decode_micromips32_opc(CPUMIPSState *env, DisasContext *ctx)
         } else {
             /* ADDIUPC */
             int reg = mmreg(ZIMM(ctx->opcode, 23, 3));
-            int offset = SIMM(ctx->opcode, 0, 23) << 2;
+            offset = SIMM(ctx->opcode, 0, 23) << 2;
 
             gen_addiupc(ctx, reg, offset, 0, 0);
         }