From: Johan Bengtsson Date: Tue, 7 Dec 2010 12:01:44 +0000 (+0000) Subject: target-arm: Fix mixup in decoding of saturating add and sub X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4809c612bc5eabf158d7a4656a98f5601c6bf104;p=qemu-xen-4.1-testing.git target-arm: Fix mixup in decoding of saturating add and sub The thumb2 decoder contained a mixup between the bit controlling doubling and the bit controlling if the operation was an add or a sub. Signed-off-by: Johan Bengtsson Signed-off-by: Peter Maydell Reviewed-by: Nathan Froyd --- diff --git a/target-arm/translate.c b/target-arm/translate.c index 183928bdd..947de6d18 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7713,9 +7713,9 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1) /* Saturating add/subtract. */ tmp = load_reg(s, rn); tmp2 = load_reg(s, rm); - if (op & 2) - gen_helper_double_saturate(tmp, tmp); if (op & 1) + gen_helper_double_saturate(tmp, tmp); + if (op & 2) gen_helper_sub_saturate(tmp, tmp2, tmp); else gen_helper_add_saturate(tmp, tmp, tmp2);