From fa70a2bc6992548608f4d69cc2b26ad08aaac0ed Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 5 Mar 2019 22:27:26 -0500 Subject: [PATCH] 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. Backports commit 9d090d17234058f55c3c439d285db78c94d7d4de from qemu --- qemu/target/arm/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c index 5a27b244..a2c9456d 100644 --- a/qemu/target/arm/translate.c +++ b/qemu/target/arm/translate.c @@ -10800,7 +10800,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);