From: Peter Collingbourne <pcc@google.com>
Date: Tue, 4 Aug 2020 00:28:49 +0000 (-0700)
Subject: target/arm: Fix decode of LDRA[AB] instructions
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d250bb19ced3b702c7c37731855f6876d0cc7995;p=people%2Fdariof%2Fqemu-xen.git

target/arm: Fix decode of LDRA[AB] instructions

These instructions use zero as the discriminator, not SP.

Signed-off-by: Peter Collingbourne <pcc@google.com>
Message-id: 20200804002849.30268-1-pcc@google.com
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

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));
         }
     }