Commit 66c946705d for qemu.org
commit 66c946705dd80f591d3f1a7fb26b5eebf3c61e31
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Wed Oct 28 13:30:51 2026 +0100
tcg/riscv64: Factor encode_vi_raw() out of encode_vi()
Move the OPIVI field layout into encode_vi_raw(), keeping the
simm5 check in encode_vi(). The next commit adds a uimm5 variant
for the vector shift instructions. No functional change.
Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Message-ID: <20261028143330.6518-2-philmd@oss.qualcomm.com>
diff --git a/tcg/riscv64/tcg-target.c.inc b/tcg/riscv64/tcg-target.c.inc
index 6da52929a4..319d5523fe 100644
--- a/tcg/riscv64/tcg-target.c.inc
+++ b/tcg/riscv64/tcg-target.c.inc
@@ -535,12 +535,18 @@ static tcg_insn_unit encode_j(RISCVInsn opc, TCGReg rd, tcg_target_long imm)
/* Type-OPIVI */
+static tcg_insn_unit encode_vi_raw(RISCVInsn opc, TCGReg rd, unsigned imm5,
+ TCGReg vs2, bool vm)
+{
+ return opc | (rd & 0x1f) << 7 | (imm5 & 0x1f) << 15 |
+ (vs2 & 0x1f) << 20 | (vm << 25);
+}
+
static tcg_insn_unit encode_vi(RISCVInsn opc, TCGReg rd, tcg_target_long imm,
TCGReg vs2, bool vm)
{
tcg_debug_assert(imm == sextract32(imm, 0, 5));
- return opc | (rd & 0x1f) << 7 | (imm & 0x1f) << 15 |
- (vs2 & 0x1f) << 20 | (vm << 25);
+ return encode_vi_raw(opc, rd, imm, vs2, vm);
}
/* Type-OPIVV/OPMVV/OPIVX/OPMVX, Vector load and store */