From patchwork Thu May 11 08:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680866 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp3267418wrs; Thu, 11 May 2023 01:12:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54MUhRCMHQvy3LoWjIIwVdZGj4L+CK4z9vrpiCeWzddWhVX4u8m0aQL0cTLOWIs7Np55St X-Received: by 2002:a05:6214:20a2:b0:621:17c6:2713 with SMTP id 2-20020a05621420a200b0062117c62713mr21930099qvd.49.1683792723053; Thu, 11 May 2023 01:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683792723; cv=none; d=google.com; s=arc-20160816; b=Tyo1Tuj/FXpqPpflx3i+v7And4JZ/S/kyRIQdBbMV9cZP0teyREJhvf2B7OzBtpAK1 8JRislQj14lVzKNw0brnlY7Vjge4StpezcN8zBNNt6+OZRIuhtX2HzpfP8i7lHLEvshS 1e6tbBOPzKu98AhhW+E/vKyFHVTek8fQkgKVS8kPEHlio/KKbIfDnO6+7Zx2a0bg7qO+ zciFMac7RsFC8E87hH0zUmKt8EaMuQ6LSMSpYFcqyqW5rUb+CkUDMfet19aOcXeuUA4M TPKxdeGp7JB9IFHR5PHbv0ycrtyjPW5hjg9I7irb5EOJsnDYDoVKBtV8240I6iPsTsL8 L1Bw== 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=lDcrnDhHvM2xbQPbYn7Q5HQ0RaVgZKVfyZ/oIHJzpXQ=; b=UnyJ6uqjam/gxEX7D6z1ceAdxr8xf637YwjNuOmLhq9IDGoyIa7JDxxIvYfsnGLZma G2Yb07e8wVVt8/59QfbOi249ZaqfAL0r4c0khGbjDZCxBE0sGh5RQTwBlsG+3YX91mzc cKSNRXtXAYpMo27My08Vd+PYaJI+OXFVVTjNFIjFbFi/FBaN+Q1q+5nEPUKxaLdvL1lI gv8XSk01zI/X+rQ0LEGRevCwsOMZuRv3hKgCn42qUXJ+qEfENptO3tbmKK/KEW60xgLZ uCpCCrYfNZc3+mhaMdXMA7gS2mPDNaqxjYw+6n9fUY8vGs7LykBvuQVSCMIkr2M1PIC3 0BZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RZeuBEcE; 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 o20-20020a05622a045400b003f0a7ba0752si2961922qtx.203.2023.05.11.01.12.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 01:12:03 -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=RZeuBEcE; 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 1px1Le-0007L4-Qy; Thu, 11 May 2023 04:08:26 -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 1px1Ld-0007JI-01 for qemu-devel@nongnu.org; Thu, 11 May 2023 04:08:25 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1px1Lb-0001xi-Aj for qemu-devel@nongnu.org; Thu, 11 May 2023 04:08:24 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-96622bca286so1120310766b.1 for ; Thu, 11 May 2023 01:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683792502; x=1686384502; 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=lDcrnDhHvM2xbQPbYn7Q5HQ0RaVgZKVfyZ/oIHJzpXQ=; b=RZeuBEcEYMWzL+62VPyTKFbTcDN1k0wSmwhtb/bC6GW+QBdnUjShSxe8p+yPniCIRF KzZHM+5k/5AXlHxD4phPn3ATiUgjdwtkRayhkeUkkRm4LNSLuXuhVEclJcNClXXpvITu A4tLHgjm6Bhlk8ITHHFNlaspcoZUR93kBb5ftwSXavl27dNLh5jYjqMSQIy1b/ZBaIuS IzYMo8k3wwO+cGYq88ul9l2zhfERAXpaJ1THDhoCVr7ObsCn3sAvgeYosezUnvq9YYTm ZOW5dz0uBro6K+3vHyrIHWGxhj3WgwnkAoPeVuf1+pju+/hj4R1C36m+7rVx9+3Ot6MF tOqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683792502; x=1686384502; 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=lDcrnDhHvM2xbQPbYn7Q5HQ0RaVgZKVfyZ/oIHJzpXQ=; b=ckHBaORYSQ/6Q3y5tZVYpzg6nSvUTZ1TLS5+BdrxfsLEky+7b4o+qifBYHAKw9O3TM x2J7tincEFuCwlgpfw0aSOlnaZdxJUFfA97YuVV3eZgvCssAddVDX9BYiGxy9FaEC63g Tlt7DNHxpXv+WYxxnRJnHtRlRUObGRElrJlEIfayE1X7PY9R/Wfn6+7YquzIbPVOhbys RtRWvwcY16Emp5M7FkLAeAw9Ka8NHg59NG5PsXS9y2q6oyxifdCUvMFg+g3K5UNEghUh lE/fddhr8My7c2fRJGUsGvPwWyQR1h7GKcMSMuTCpJ/nd2+nmGawbYiDhDxbvomnv/yN PESg== X-Gm-Message-State: AC+VfDyidiBddBSf21uCs3RmXQyJ9keQSQzPAHeD//qRN/s7SAwMG92b PcIQbGH17NvOpXJQf96jLA/0pPuZdFeu0R9LtpiraA== X-Received: by 2002:a17:907:940c:b0:960:ddba:e5bb with SMTP id dk12-20020a170907940c00b00960ddbae5bbmr18342977ejc.43.1683792501858; Thu, 11 May 2023 01:08:21 -0700 (PDT) Received: from stoup.. ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ci18-20020a170907267200b00959c6cb82basm3635225ejc.105.2023.05.11.01.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 01:08:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 48/53] tcg: Remove TARGET_ALIGNED_ONLY Date: Thu, 11 May 2023 09:04:45 +0100 Message-Id: <20230511080450.860923-49-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511080450.860923-1-richard.henderson@linaro.org> References: <20230511080450.860923-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-ej1-x636.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 All uses have now been expunged. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/exec/memop.h | 13 ++----------- include/exec/poison.h | 1 - tcg/tcg.c | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/include/exec/memop.h b/include/exec/memop.h index 25d027434a..07f5f88188 100644 --- a/include/exec/memop.h +++ b/include/exec/memop.h @@ -47,8 +47,6 @@ typedef enum MemOp { * MO_UNALN accesses are never checked for alignment. * MO_ALIGN accesses will result in a call to the CPU's * do_unaligned_access hook if the guest address is not aligned. - * The default depends on whether the target CPU defines - * TARGET_ALIGNED_ONLY. * * Some architectures (e.g. ARMv8) need the address which is aligned * to a size more than the size of the memory access. @@ -65,21 +63,14 @@ typedef enum MemOp { */ MO_ASHIFT = 5, MO_AMASK = 0x7 << MO_ASHIFT, -#ifdef NEED_CPU_H -#ifdef TARGET_ALIGNED_ONLY - MO_ALIGN = 0, - MO_UNALN = MO_AMASK, -#else - MO_ALIGN = MO_AMASK, - MO_UNALN = 0, -#endif -#endif + MO_UNALN = 0, MO_ALIGN_2 = 1 << MO_ASHIFT, MO_ALIGN_4 = 2 << MO_ASHIFT, MO_ALIGN_8 = 3 << MO_ASHIFT, MO_ALIGN_16 = 4 << MO_ASHIFT, MO_ALIGN_32 = 5 << MO_ASHIFT, MO_ALIGN_64 = 6 << MO_ASHIFT, + MO_ALIGN = MO_AMASK, /* Combinations of the above, for ease of use. */ MO_UB = MO_8, diff --git a/include/exec/poison.h b/include/exec/poison.h index 140daa4a85..256736e11a 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -35,7 +35,6 @@ #pragma GCC poison TARGET_TRICORE #pragma GCC poison TARGET_XTENSA -#pragma GCC poison TARGET_ALIGNED_ONLY #pragma GCC poison TARGET_HAS_BFLT #pragma GCC poison TARGET_NAME #pragma GCC poison TARGET_SUPPORTS_MTTCG diff --git a/tcg/tcg.c b/tcg/tcg.c index 88fe01f59f..1231c8ab4c 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2185,13 +2185,8 @@ static const char * const ldst_name[] = }; static const char * const alignment_name[(MO_AMASK >> MO_ASHIFT) + 1] = { -#ifdef TARGET_ALIGNED_ONLY [MO_UNALN >> MO_ASHIFT] = "un+", - [MO_ALIGN >> MO_ASHIFT] = "", -#else - [MO_UNALN >> MO_ASHIFT] = "", [MO_ALIGN >> MO_ASHIFT] = "al+", -#endif [MO_ALIGN_2 >> MO_ASHIFT] = "al2+", [MO_ALIGN_4 >> MO_ASHIFT] = "al4+", [MO_ALIGN_8 >> MO_ASHIFT] = "al8+",