From patchwork Tue Apr 25 19:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 676836 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2880842wrs; Tue, 25 Apr 2023 12:44:02 -0700 (PDT) X-Google-Smtp-Source: AKy350aqIdg44roJZEatFxlzClZrPH5SmI0CmHnEXAYs0m9pYaWVWrCx08kSjXa8VM2a9TZCli9W X-Received: by 2002:ac8:5916:0:b0:3ef:35e2:ade9 with SMTP id 22-20020ac85916000000b003ef35e2ade9mr27822537qty.33.1682451842548; Tue, 25 Apr 2023 12:44:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682451842; cv=none; d=google.com; s=arc-20160816; b=cGotKsKhehfty2XWvENlMKOJWFL82BURar5gsBXt5lEiZjjNfyHQhZ6e7wYwEq1pGJ m7TP9spsGfIopZLX52rpnMZ/zaZ2axvsQllu7CxszVMGP1o+ZXN42nFGTSlbYOnecVdF 5NGKYTFqNR5o7v6ZKO1EMXuEg7tUOh0cWxLCZAWpbV2DuTPj3u1cphs1/7cF8KRzsbM3 8b/VXqF9kRs7sSqq9tRR39pXXjoWAdsMduUuzk1TwpCWoEMLA4eHdDUbmIyR+NGrn1BE KfxH8dDZwnnQQErJxfaeiSpmEsDw8/Bk4LVRdFE7cezJ8+5lWpf2IPM0A/seE6nzEznn xj/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=VhQ4va+L9W76HQPa92crHAm/u67MMsKKHsaZ1OacYxI=; b=WI3OInzTOYTEkofvdtURG5RaW4mMuNcKxMoDA3vgYozhpX2sRF9dypC7dXCYv1aOs1 jY51SY2C4DK6GH327VZs36ysvRCQhKuyGQd6kr96wUI+GFhP3pku5Lirb5tRMBMc7nSR SXVNNRC+TmxvATOMG4o0f9nAtBro4o02JDMOgvpH6S8cg0ye9XSWO9/kGE/WLebjRnP2 t/JawpNh8fZ0OOdHRIPvto8X28R6HDlqC7mOa+STl7QNLeZKetUOVQNmEpC/tm98qIYj UNhyZORT/idhoyqqsV1xHwoveM53+AA7p+L83XU/Wk6EYzvrE03vi/lSB3FIQwmDFeHv qtBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tcgRlDw6; 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 x3-20020a05620a448300b0074e174f7d9fsi9714882qkp.69.2023.04.25.12.44.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Apr 2023 12:44:02 -0700 (PDT) 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=tcgRlDw6; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prOXo-0002cs-Fu; Tue, 25 Apr 2023 15:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prOXn-0002ca-GV for qemu-devel@nongnu.org; Tue, 25 Apr 2023 15:41:43 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prOXX-0007Gx-MU for qemu-devel@nongnu.org; Tue, 25 Apr 2023 15:41:43 -0400 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4edcdfa8638so6745678e87.2 for ; Tue, 25 Apr 2023 12:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682451686; x=1685043686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VhQ4va+L9W76HQPa92crHAm/u67MMsKKHsaZ1OacYxI=; b=tcgRlDw6ECIOkgdNni+h2heGVFiX9cdS6dn2eQ75VTg7UFOR0S2Jv0RNtS3C0Sgg2g 343A006kqSjq/4NrAs8sbl90RQPN2O2yHOYfkcdMTpVBrJOvSB1NOFkqe827Pvaxq4Ot /Qpvz6TqZBss7eH9JeHgOoHTasNA8gLJaHw9rx/afpWOKMpsUtApdlogPE8SGxN1euN7 8yYPJeR7ccOFuKRWCR4Fcv4j7OE/1QCO+W2e0hCFErdlXOAM9Z9WoEk7WAR1/s90CPs/ 3mPFqnX/i1dhPI2+SlNanUC99J1xe7tc8lx1DI/3crRiiDcqVpTD2ihCNIaqFOSD1NZd L4jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682451686; x=1685043686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VhQ4va+L9W76HQPa92crHAm/u67MMsKKHsaZ1OacYxI=; b=DszPUjS9D6AGG7NBIXTdcAfzduLV5Z2AvhbIWY8eYkzZoyYJhzDq/OauCYxTWktm9Q V0OcuOqYBAP21V6sOuA8cg7ehHAyW0qvmHdSJUcbgDsp29+ALUIfQmrNFJRYi2iVddJG v4hwDOXFlqKzRzmTaWZW/MrYeD0Wksb8eMoPVMh5O+/bipIPvOVYR+eXXS4l8jtjUyYt GmmWkIpQoh30GN5W9I3iv9l/ubHpvq4aec0Jl8Vr7UrK/2qAQB3EljUse+gkpEKmajFT N0r7IBohtd+o2ny33NFAk8i23BvJyCNX6YlKy+v1FMXFPTj8VOhGq9pIb5Aq3WI/5ssc VqYw== X-Gm-Message-State: AAQBX9cHgxRakoLnXqcpIY1hDPyXPKQlKI61BdDspNG7dFYOopg0y0Sv gKuo2odKmMqXMo7TjActWXgaiyiVrulx16q3KeO5zg== X-Received: by 2002:ac2:4563:0:b0:4ec:8b57:b018 with SMTP id k3-20020ac24563000000b004ec8b57b018mr4377425lfm.33.1682451686253; Tue, 25 Apr 2023 12:41:26 -0700 (PDT) Received: from stoup.. ([91.209.212.61]) by smtp.gmail.com with ESMTPSA id d8-20020ac25448000000b004ec55ac6cd1sm2175662lfn.136.2023.04.25.12.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Apr 2023 12:41:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, git@xen0n.name, jiaxun.yang@flygoat.com, philmd@linaro.org Subject: [PATCH v3 46/57] tcg/loongarch64: Use atom_and_align_for_opc Date: Tue, 25 Apr 2023 20:31:35 +0100 Message-Id: <20230425193146.2106111-47-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425193146.2106111-1-richard.henderson@linaro.org> References: <20230425193146.2106111-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=richard.henderson@linaro.org; helo=mail-lf1-x132.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Richard Henderson --- tcg/loongarch64/tcg-target.c.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tcg/loongarch64/tcg-target.c.inc b/tcg/loongarch64/tcg-target.c.inc index 62bf823084..43341524f2 100644 --- a/tcg/loongarch64/tcg-target.c.inc +++ b/tcg/loongarch64/tcg-target.c.inc @@ -826,6 +826,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) typedef struct { TCGReg base; TCGReg index; + MemOp align; + MemOp atom; } HostAddress; bool tcg_target_has_memory_bswap(MemOp memop) @@ -845,7 +847,11 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, { TCGLabelQemuLdst *ldst = NULL; MemOp opc = get_memop(oi); - unsigned a_bits = get_alignment_bits(opc); + MemOp a_bits, atom_u; + + a_bits = atom_and_align_for_opc(s, &h->atom, &atom_u, opc, + MO_ATOM_IFALIGN, false); + h->align = a_bits; #ifdef CONFIG_SOFTMMU unsigned s_bits = opc & MO_SIZE;