target/arm: Use ror32 instead of open-coding the operation

The helper function is more documentary, and also already
handles the case of rotate by zero.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190808202616.13782-5-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2019-08-08 13:26:13 -07:00 committed by Peter Maydell
parent 464eaa9571
commit dd861b3f29

View File

@ -7964,8 +7964,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
/* CPSR = immediate */ /* CPSR = immediate */
val = insn & 0xff; val = insn & 0xff;
shift = ((insn >> 8) & 0xf) * 2; shift = ((insn >> 8) & 0xf) * 2;
if (shift) val = ror32(val, shift);
val = (val >> shift) | (val << (32 - shift));
i = ((insn & (1 << 22)) != 0); i = ((insn & (1 << 22)) != 0);
if (gen_set_psr_im(s, msr_mask(s, (insn >> 16) & 0xf, i), if (gen_set_psr_im(s, msr_mask(s, (insn >> 16) & 0xf, i),
i, val)) { i, val)) {
@ -8228,9 +8227,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
/* immediate operand */ /* immediate operand */
val = insn & 0xff; val = insn & 0xff;
shift = ((insn >> 8) & 0xf) * 2; shift = ((insn >> 8) & 0xf) * 2;
if (shift) { val = ror32(val, shift);
val = (val >> shift) | (val << (32 - shift));
}
tmp2 = tcg_temp_new_i32(); tmp2 = tcg_temp_new_i32();
tcg_gen_movi_i32(tmp2, val); tcg_gen_movi_i32(tmp2, val);
if (logic_cc && shift) { if (logic_cc && shift) {