target-arm: A64: Fix bug in add_sub_ext handling of rn
rn == 31 always means SP (not XZR) whether an add_sub_ext instruction is setting the flags or not; only rd has behaviour dependent on whether we are setting flags. Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net> Message-id: 1394822294-14837-3-git-send-email-peter.maydell@linaro.org
This commit is contained in:
parent
a984e42c91
commit
cf4ab1af29
|
@ -3096,12 +3096,11 @@ static void disas_add_sub_ext_reg(DisasContext *s, uint32_t insn)
|
||||||
|
|
||||||
/* non-flag setting ops may use SP */
|
/* non-flag setting ops may use SP */
|
||||||
if (!setflags) {
|
if (!setflags) {
|
||||||
tcg_rn = read_cpu_reg_sp(s, rn, sf);
|
|
||||||
tcg_rd = cpu_reg_sp(s, rd);
|
tcg_rd = cpu_reg_sp(s, rd);
|
||||||
} else {
|
} else {
|
||||||
tcg_rn = read_cpu_reg(s, rn, sf);
|
|
||||||
tcg_rd = cpu_reg(s, rd);
|
tcg_rd = cpu_reg(s, rd);
|
||||||
}
|
}
|
||||||
|
tcg_rn = read_cpu_reg_sp(s, rn, sf);
|
||||||
|
|
||||||
tcg_rm = read_cpu_reg(s, rm, sf);
|
tcg_rm = read_cpu_reg(s, rm, sf);
|
||||||
ext_and_shift_reg(tcg_rm, tcg_rm, option, imm3);
|
ext_and_shift_reg(tcg_rm, tcg_rm, option, imm3);
|
||||||
|
|
Loading…
Reference in a new issue