diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-03-01 12:29:21 -0800 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-05 15:55:07 +0000 |
| commit | 9d090d17234058f55c3c439d285db78c94d7d4de (patch) | |
| tree | e4a01183f6b3267872058c276d2cf34b0a909a1a /target/arm | |
| parent | 0984a157c1c053394adbf64ed7de97f1aebe6a2d (diff) | |
| download | qemu-9d090d17234058f55c3c439d285db78c94d7d4de.zip qemu-9d090d17234058f55c3c439d285db78c94d7d4de.tar.gz qemu-9d090d17234058f55c3c439d285db78c94d7d4de.tar.bz2 | |
target/arm: Fix PC test for LDM (exception return)
Found by inspection: Rn is the base register against which the
load began; I is the register within the mask being processed.
The exception return should of course be processed from the loaded PC.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190301202921.21209-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/translate.c b/target/arm/translate.c index 8f7f5b9..ad879e3 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10612,7 +10612,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } else if (i == rn) { loaded_var = tmp; loaded_base = 1; - } else if (rn == 15 && exc_return) { + } else if (i == 15 && exc_return) { store_pc_exc_ret(s, tmp); } else { store_reg_from_load(s, i, tmp); |