From patchwork Sat Jan 8 06:33:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 530695 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp987692imp; Fri, 7 Jan 2022 23:35:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRNPh2D1t8+GTp3voqQCpUBbETqQp16y2e+BNqghe5h+HzHhVZ3VrAgBjSbpCtq9B1F5H3 X-Received: by 2002:a25:b09e:: with SMTP id f30mr1610146ybj.368.1641627322001; Fri, 07 Jan 2022 23:35:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641627321; cv=none; d=google.com; s=arc-20160816; b=QsNA5gLMdcEtUpAMsqX8l1EGO3Way9uTuxqTlRZTIDOQz2IGoNKedF0JX6aF/UopyC BMAgmn57igXgUZH/ytAybKMbC13yEL2ZkbATeTOevz1UasYD3VThGTtGs6dyesq8oL3G Rqx3rRzedpb5xbpFZpR5uHjKYImJ948gx1Dwkr8OZ19R2ohdnHz0yRse0dljdJkGraJe I6ccCJFln/FKOPj716c1z/ZbHahM6AXZlvODik0iNIR8dxg/G2cM0iOSQSBn2wRuDlyq CvfIORturVNP7CCGxJm+blVfX93zllelxM0IurcYaSdmK0eRdu+GYZBz0rbbm7wz4xS3 k7dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=/AYwq3dHnlsFGe0HxehxjaeDvoLxdWXzGgDqUZldkDo=; b=CbpdGGvq80hiv9a8Nzysgnd5QvX7ukCC/1p54pb9slHSiDAldk9OpNXPOYwVfH0fjo e+3WqBS+T3lqzVbi/w2VoJYNLr3tl1aB/AVmy3nvDqU1RfsezYVKs982urJN9UioWI8s 8N/lDMm4cvUsCaShAdKJc+560EJ1SDrj3OiE/ed2ZaoFsMu0+DTZ97IniXG3x5FaRD5s QN5Bj2AcqneZgljkDBz+UK0UXkHpA2Jig+VK9MKvgFEMkjDwTb9zXUkHhSw+UF2zX6SE TDEDacdQwIZFuRyjBFjqJA9LvJizu+hrqXNor4vSIVwJ6IlvRLW/97PFrSBcDpDT7Gl9 Up6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TBmM4wK2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c18si612675ybs.725.2022.01.07.23.35.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jan 2022 23:35:21 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TBmM4wK2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n66G0-0001zR-D7 for patch@linaro.org; Sat, 08 Jan 2022 02:35:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n65I4-0001Lu-KN for qemu-devel@nongnu.org; Sat, 08 Jan 2022 01:33:30 -0500 Received: from [2607:f8b0:4864:20::62a] (port=36860 helo=mail-pl1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n65I3-0003cY-5Q for qemu-devel@nongnu.org; Sat, 08 Jan 2022 01:33:24 -0500 Received: by mail-pl1-x62a.google.com with SMTP id p14so6707086plf.3 for ; Fri, 07 Jan 2022 22:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/AYwq3dHnlsFGe0HxehxjaeDvoLxdWXzGgDqUZldkDo=; b=TBmM4wK2YA18yUt9+NsWvwgYuCjxSZ5BWVk7I1bBOY1bsZCnuEbgeZk5gQHAEZfxXM rf/wN4BTE+5/ygM7NP3YyyMkfymTQu8P9kIocaRXqi/CrMyifCoD6C/d0iLBoHDuR0mo kabh3z6GyL68Q+uyjMfE5+lel0VgNMUsXuBeu28ZRQU3IXGcpOHHX1NfLop1zamTy+Oy /RZQshH9+KUgtpFCGCkSWp9yS2RHBzQzvzpMTx2yC5OjEzz/VFW3e81XGl0iC2/z+3nG nl8EYwTQXr8YWf5Ugh/VNaXxZq8Jo5DrkHjLCFqjEeHbqZYBfuV8uBLQxPaE6flo+MSJ 1Q7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/AYwq3dHnlsFGe0HxehxjaeDvoLxdWXzGgDqUZldkDo=; b=z3VCNlHI2w6sl1NeAf4G+f/BWnsz5g/Aa0wO5qYtR/mHb+CrhqsSPKk/G/kiDU7kda g89D5qnLMmUlckBBgXywfy7gXNND2nudtlfRUDtwOcXdb36iNvq90338aw0oyyf9wuhY DparLlUMTgeMaR30sbsBhdqCpS/q6gbZJLkHLjn7iOL9hbECofB8PSR6eLy9AbJ1tZeR aHwCtK8GdAtQGGvgkubhTjqaMZDXMuN34Gm5zlYLCURo0UYVNKAeTPhwryC3o8hgCIbv YL4EvVWtg0YncbP3FIyKy20Amj4MKbnbNmmqmKKC9FET5F1yNXGGVjm58W4Muvy36ySs BTwQ== X-Gm-Message-State: AOAM530g8xp/VODls92Ed6YmIaK+sWJzpGFk8E91g3ZLLP/3AvdRhb/L wY93MQCT63PrGePv0pzylIoL1Z2LZExwnA== X-Received: by 2002:a17:902:d4c8:b0:149:c99e:dd83 with SMTP id o8-20020a170902d4c800b00149c99edd83mr16295027plg.146.1641623601943; Fri, 07 Jan 2022 22:33:21 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s7sm834760pfu.133.2022.01.07.22.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 22:33:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 4/7] tcg/arm: Check alignment for ldrd and strd Date: Fri, 7 Jan 2022 22:33:10 -0800 Message-Id: <20220108063313.477784-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220108063313.477784-1-richard.henderson@linaro.org> References: <20220108063313.477784-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We will shortly allow the use of unaligned memory accesses, and these require proper alignment. Use get_alignment_bits to verify and remove USING_SOFTMMU. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/arm/tcg-target.c.inc | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index ea8b90e6e2..8a20224dd1 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -35,12 +35,6 @@ bool use_neon_instructions; #endif /* ??? Ought to think about changing CONFIG_SOFTMMU to always defined. */ -#ifdef CONFIG_SOFTMMU -# define USING_SOFTMMU 1 -#else -# define USING_SOFTMMU 0 -#endif - #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { "%r0", "%r1", "%r2", "%r3", "%r4", "%r5", "%r6", "%r7", @@ -1621,8 +1615,8 @@ static void tcg_out_qemu_ld_index(TCGContext *s, MemOp opc, tcg_out_ld32_r(s, COND_AL, datalo, addrlo, addend); break; case MO_Q: - /* Avoid ldrd for user-only emulation, to handle unaligned. */ - if (USING_SOFTMMU + /* LDRD requires alignment; double-check that. */ + if (get_alignment_bits(opc) >= MO_64 && (datalo & 1) == 0 && datahi == datalo + 1) { tcg_out_ldrd_r(s, COND_AL, datalo, addrlo, addend); } else if (datalo != addend) { @@ -1664,8 +1658,8 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, MemOp opc, TCGReg datalo, tcg_out_ld32_12(s, COND_AL, datalo, addrlo, 0); break; case MO_Q: - /* Avoid ldrd for user-only emulation, to handle unaligned. */ - if (USING_SOFTMMU + /* LDRD requires alignment; double-check that. */ + if (get_alignment_bits(opc) >= MO_64 && (datalo & 1) == 0 && datahi == datalo + 1) { tcg_out_ldrd_8(s, COND_AL, datalo, addrlo, 0); } else if (datalo == addrlo) { @@ -1741,8 +1735,8 @@ static void tcg_out_qemu_st_index(TCGContext *s, ARMCond cond, MemOp opc, tcg_out_st32_r(s, cond, datalo, addrlo, addend); break; case MO_64: - /* Avoid strd for user-only emulation, to handle unaligned. */ - if (USING_SOFTMMU + /* STRD requires alignment; double-check that. */ + if (get_alignment_bits(opc) >= MO_64 && (datalo & 1) == 0 && datahi == datalo + 1) { tcg_out_strd_r(s, cond, datalo, addrlo, addend); } else { @@ -1773,8 +1767,8 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg datalo, tcg_out_st32_12(s, COND_AL, datalo, addrlo, 0); break; case MO_64: - /* Avoid strd for user-only emulation, to handle unaligned. */ - if (USING_SOFTMMU + /* STRD requires alignment; double-check that. */ + if (get_alignment_bits(opc) >= MO_64 && (datalo & 1) == 0 && datahi == datalo + 1) { tcg_out_strd_8(s, COND_AL, datalo, addrlo, 0); } else {