diff options
| author | Johan Bengtsson <teofrastius@gmail.com> | 2010-12-07 12:01:44 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2010-12-07 12:01:44 +0000 |
| commit | 4809c612bc5eabf158d7a4656a98f5601c6bf104 (patch) | |
| tree | 2143b31eac7cdd8648a41c8cff4f74ddf048ff24 /target-arm | |
| parent | 2af9ab7737c050e063dc939973a8d669a3ab3743 (diff) | |
| download | qemu-4809c612bc5eabf158d7a4656a98f5601c6bf104.zip qemu-4809c612bc5eabf158d7a4656a98f5601c6bf104.tar.gz qemu-4809c612bc5eabf158d7a4656a98f5601c6bf104.tar.bz2 | |
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 <teofrastius@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Nathan Froyd <froydnj@codesourcery.com>
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c index 183928b..947de6d 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); |