[v3,14/30] target/arm: Enforce word alignment for LDRD/STRD

Message ID	20210111190113.303726-15-richard.henderson@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH v3 14/30] target/arm: Enforce word alignment for LDRD/STRD Date: Mon, 11 Jan 2021 09:00:57 -1000 Message-Id: <20210111190113.303726-15-richard.henderson@linaro.org> In-Reply-To: <20210111190113.303726-1-richard.henderson@linaro.org> References: <20210111190113.303726-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action Precedence: list Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	target/arm: enforce alignment \| expand [v3,00/30] target/arm: enforce alignment [v3,01/30] target/arm: Fix decode of align in VLDST_single [v3,02/30] target/arm: Rename TBFLAG_A32, SCTLR_B [v3,03/30] target/arm: Rename TBFLAG_ANY, PSTATE_SS [v3,04/30] target/arm: Add wrapper macros for accessing tbflags [v3,05/30] target/arm: Introduce CPUARMTBFlags [v3,06/30] target/arm: Move mode specific TB flags to tb->cs_base [v3,07/30] target/arm: Move TBFLAG_AM32 bits to the top [v3,08/30] target/arm: Move TBFLAG_ANY bits to the bottom [v3,09/30] target/arm: Add ALIGN_MEM to TBFLAG_ANY [v3,10/30] target/arm: Adjust gen_aa32_{ld, st}_i32 for align+endianness [v3,11/30] target/arm: Merge gen_aa32_frob64 into gen_aa32_ld_i64 [v3,12/30] target/arm: Fix SCTLR_B test for TCGv_i64 load/store [v3,13/30] target/arm: Adjust gen_aa32_{ld, st}_i64 for align+endianness [v3,14/30] target/arm: Enforce word alignment for LDRD/STRD [v3,15/30] target/arm: Enforce alignment for LDA/LDAH/STL/STLH [v3,16/30] target/arm: Enforce alignment for LDM/STM [v3,17/30] target/arm: Enforce alignment for RFE [v3,18/30] target/arm: Enforce alignment for SRS [v3,19/30] target/arm: Enforce alignment for VLDM/VSTM [v3,20/30] target/arm: Enforce alignment for VLDR/VSTR [v3,21/30] target/arm: Enforce alignment for VLDn (all lanes) [v3,22/30] target/arm: Enforce alignment for VLDn/VSTn (multiple) [v3,23/30] target/arm: Enforce alignment for VLDn/VSTn (single) [v3,24/30] target/arm: Use finalize_memop for aa64 gpr load/store [v3,25/30] target/arm: Use finalize_memop for aa64 fpr load/store [v3,26/30] target/arm: Enforce alignment for aa64 load-acq/store-rel [v3,27/30] target/arm: Use MemOp for size + endian in aa64 vector ld/st [v3,28/30] target/arm: Enforce alignment for aa64 vector LDn/STn (multiple) [v3,29/30] target/arm: Enforce alignment for aa64 vector LDn/STn (single) [v3,30/30] target/arm: Enforce alignment for sve LD1R

Message ID

20210111190113.303726-15-richard.henderson@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v3 14/30] target/arm: Enforce word alignment for LDRD/STRD
Date: Mon, 11 Jan 2021 09:00:57 -1000
Message-Id: <20210111190113.303726-15-richard.henderson@linaro.org>
In-Reply-To: <20210111190113.303726-1-richard.henderson@linaro.org>
References: <20210111190113.303726-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::1031;
	envelope-from=richard.henderson@linaro.org;
	helo=mail-pj1-x1031.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
	DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
	RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
	SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

target/arm: enforce alignment | expand

Commit Message

Richard Henderson Jan. 11, 2021, 7 p.m. UTC

Buglink: https://bugs.launchpad.net/qemu/+bug/1905356
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/arm/translate.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

-- 
2.25.1

diff --git a/target/arm/translate.c b/target/arm/translate.c
index f75987dac4..9cc6a9f83d 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -6475,13 +6475,13 @@  static bool trans_LDRD_rr(DisasContext *s, arg_ldst_rr *a)
     addr = op_addr_rr_pre(s, a);
 
     tmp = tcg_temp_new_i32();
-    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     store_reg(s, a->rt, tmp);
 
     tcg_gen_addi_i32(addr, addr, 4);
 
     tmp = tcg_temp_new_i32();
-    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     store_reg(s, a->rt + 1, tmp);
 
     /* LDRD w/ base writeback is undefined if the registers overlap.  */
@@ -6504,13 +6504,13 @@  static bool trans_STRD_rr(DisasContext *s, arg_ldst_rr *a)
     addr = op_addr_rr_pre(s, a);
 
     tmp = load_reg(s, a->rt);
-    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     tcg_temp_free_i32(tmp);
 
     tcg_gen_addi_i32(addr, addr, 4);
 
     tmp = load_reg(s, a->rt + 1);
-    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     tcg_temp_free_i32(tmp);
 
     op_addr_rr_post(s, a, addr, -4);
@@ -6612,13 +6612,13 @@  static bool op_ldrd_ri(DisasContext *s, arg_ldst_ri *a, int rt2)
     addr = op_addr_ri_pre(s, a);
 
     tmp = tcg_temp_new_i32();
-    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     store_reg(s, a->rt, tmp);
 
     tcg_gen_addi_i32(addr, addr, 4);
 
     tmp = tcg_temp_new_i32();
-    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_ld_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     store_reg(s, rt2, tmp);
 
     /* LDRD w/ base writeback is undefined if the registers overlap.  */
@@ -6651,13 +6651,13 @@  static bool op_strd_ri(DisasContext *s, arg_ldst_ri *a, int rt2)
     addr = op_addr_ri_pre(s, a);
 
     tmp = load_reg(s, a->rt);
-    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     tcg_temp_free_i32(tmp);
 
     tcg_gen_addi_i32(addr, addr, 4);
 
     tmp = load_reg(s, rt2);
-    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL);
+    gen_aa32_st_i32(s, tmp, addr, mem_idx, MO_UL | MO_ALIGN);
     tcg_temp_free_i32(tmp);
 
     op_addr_ri_post(s, a, addr, -4);

[v3,14/30] target/arm: Enforce word alignment for LDRD/STRD

Commit Message

Patch