From patchwork Tue May 2 16:08:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678427 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp596094wrs; Tue, 2 May 2023 09:11:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mvf0UKXwPJpVm0ib+m0i9oRJzxpvGvE8JJPFp8HSlQcBp9S1Kup0QdzL6AOgr4k19sQQh X-Received: by 2002:a05:622a:100a:b0:3f1:fa37:c830 with SMTP id d10-20020a05622a100a00b003f1fa37c830mr27702315qte.49.1683043878002; Tue, 02 May 2023 09:11:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683043877; cv=none; d=google.com; s=arc-20160816; b=d0dMs+Zxiq6PaY4qzFcWfeiPXXk4T//jpWkrBJjyajClybvJl8TyRc8R6xfL5jU2t7 fszRpyLSXtsL3yeS2M5bRT826zIllSf7r4clZP8bxECXwbSwKvEh0RAMukcV7fufnuPB pe3SqxGU+0JOqUC/Kyp8bgQC6SotjB2D91CiW2oSJTxuVj6J6omd9B8/QcVkaf5UP6TI Rgqr6WE5H4nt96eJGPCAXQo/wbSJ71EzTMMG7awIElS8g+tF5yXH6TjUIR0K8Jtz2uQ7 Qx8e2Ltvv0GFgwLNfotBIwl9RySksgTChg6KPruHpHGwEIIPKzp4iDXCZCvS8y3Av8Qd nXLA== 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=V/VkzTTqO3D6h3H85l5Fuk7F2N9PjLSut9TQvQbh7t8=; b=vTzy+UaqGmjB5dxauYxwhcRpd5g5Xludjj8GBZahnvJbFswLlUfrNLSv7+HQS6BwsC uSHaPxanK1RPLXiWFyIjFqWjUlPo6Tmm4KD4z7dBDpng07liBbWrfx4l982YcqF28gWJ 4iUN0XNG/G7rscVGkYoGsCPUe9/s5Tizkbr8a8EomH0rlNdzNc03+iOfyPlH7xXW6VxB F0sLeCirDjF7YGaO5VUti9a7CJxtabCClkS0PGko3839WHJiqwp28LqTy3tQEzWeGJuA rF3trcspGjMrfPBT6Edp1ztCud/1fjm2z598h8hndrlEAW8RmCxjTPloe/utwBux6m97 2COw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gAQsTkjn; 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 w1-20020a05620a444100b0074ced3e0003si18632709qkp.26.2023.05.02.09.11.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 May 2023 09:11:17 -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=gAQsTkjn; 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 1ptsZ0-0002r8-3h; Tue, 02 May 2023 12:09:14 -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 1ptsYq-0002oJ-M1 for qemu-devel@nongnu.org; Tue, 02 May 2023 12:09:04 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptsYn-0000lT-Id for qemu-devel@nongnu.org; Tue, 02 May 2023 12:09:04 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3062678861fso2193438f8f.0 for ; Tue, 02 May 2023 09:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683043738; x=1685635738; 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=V/VkzTTqO3D6h3H85l5Fuk7F2N9PjLSut9TQvQbh7t8=; b=gAQsTkjnll3StMQpBK++s438VyluyAXkbKheuaQIz9WAMZpMUMdTYJWWMzCmQY/J2o fVbn7p4lgLguKBKXu3LXaOvLVubXFD9/BM4F6IYuDpW3NkRG5DRVfU/dMww8DN4YksN/ 9HvELRkjPslKu6Etn24xJOF45Mez0hGSXnS2ejNzJWBfuKNYrlThM+pBVDOPA/es4bWp /IvbrA2JZWObha9EsufOJikL/p6LecoQzjKcl4HgeLYA6YH4jtddNK2k8TPq4/nJMP/L 86WSUEsVHJmf+S7ArnRu2J0SvRk5lPpwhESS8HfFSB3ZxqkHSJFvBuWS2Y1dwpn9b5dn A5fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683043738; x=1685635738; 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=V/VkzTTqO3D6h3H85l5Fuk7F2N9PjLSut9TQvQbh7t8=; b=CN4XhFdpraQLR5GZ4vrxycucCTd4jyySitmH2CeDosnRLd5kE9d2iy49nsaUS1nD9t oLgKKG0Wfc4HH0ybYMnI0KE0GkabyRlhtkWv3y/JKbfxQS3JFmRllBEbAaqvDsMyrwxB Vy/W9kG8jFrZT+zOiaxZCy1cKU2WN2OSVFcGVTJWjIaGf/3lNUAwvbsTNIemB8wLWkOL GOyUhan5YL2cSjOiaQImnkWH8uol3gV6janLFsTzyJBXgDYiXNXc0/dU4x47kGg09MO0 IljC1O8qBLWYbIlYGjDDBBfEv8NYix5KE/+RC4Mb9KOXQ3JCxGn0rUf+2/smuosbkmd1 jWXQ== X-Gm-Message-State: AC+VfDwcW/HK3Ocmw4XS4a4fMaVXV+h0gr53O9fvBZvM7EfDA3gSrfcF pH37HAtwXlECtqnzCJCYsL5GxMLtwAHW6EN1UWOQhg== X-Received: by 2002:a5d:5492:0:b0:304:a984:7cb5 with SMTP id h18-20020a5d5492000000b00304a9847cb5mr12472753wrv.50.1683043738616; Tue, 02 May 2023 09:08:58 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id v16-20020a05600c471000b003ede3f5c81fsm39918471wmo.41.2023.05.02.09.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 09:08:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, jiaxun.yang@flygoat.com, crwulff@gmail.com, marex@denx.de, ysato@users.sourceforge.jp, mark.cave-ayland@ilande.co.uk Subject: [PATCH 16/16] tcg: Remove TARGET_ALIGNED_ONLY Date: Tue, 2 May 2023 17:08:46 +0100 Message-Id: <20230502160846.1289975-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502160846.1289975-1-richard.henderson@linaro.org> References: <20230502160846.1289975-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x429.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. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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 cfd3262a4a..2ce9dba25c 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2071,13 +2071,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+",