From d250bb19ced3b702c7c37731855f6876d0cc7995 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Mon, 3 Aug 2020 17:28:49 -0700 Subject: [PATCH] target/arm: Fix decode of LDRA[AB] instructions These instructions use zero as the discriminator, not SP. Signed-off-by: Peter Collingbourne Message-id: 20200804002849.30268-1-pcc@google.com Reviewed-by: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index c98dfb17a8..534c3ff5f3 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -3429,9 +3429,11 @@ static void disas_ldst_pac(DisasContext *s, uint32_t insn, if (s->pauth_active) { if (use_key_a) { - gen_helper_autda(dirty_addr, cpu_env, dirty_addr, cpu_X[31]); + gen_helper_autda(dirty_addr, cpu_env, dirty_addr, + new_tmp_a64_zero(s)); } else { - gen_helper_autdb(dirty_addr, cpu_env, dirty_addr, cpu_X[31]); + gen_helper_autdb(dirty_addr, cpu_env, dirty_addr, + new_tmp_a64_zero(s)); } } -- 2.39.5