From: Leon Alrae <leon.alrae@imgtec.com>
Date: Mon, 26 Jan 2015 16:58:57 +0000 (+0000)
Subject: target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction
X-Git-Tag: v2.3.0-rc0~60^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e88759a52934a32502298f2c78c6dfaa144364b;p=thirdparty%2Fqemu.git

target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction

Using rs = -1 in gen_logic_imm() for microMIPS LUI instruction is dangerous
and may bite us when implementing microMIPS R6 because in R6 AUI and LUI
are distinguished by rs value. Therefore use 0 for safety.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
---

diff --git a/target-mips/translate.c b/target-mips/translate.c
index b80af985938..ca51149872a 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -13653,7 +13653,7 @@ static void decode_micromips32_opc (CPUMIPSState *env, DisasContext *ctx,
                target. */
             break;
         case LUI:
-            gen_logic_imm(ctx, OPC_LUI, rs, -1, imm);
+            gen_logic_imm(ctx, OPC_LUI, rs, 0, imm);
             break;
         case SYNCI:
             /* Break the TB to be able to sync copied instructions