From patchwork Wed Aug 18 21:29:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 499008 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp1053801jab; Wed, 18 Aug 2021 14:30:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYZZzRZVRNa4zSddE7NtGIXLzB/XM8UYcQws5xTcEjD9RgfinEJP6hZGrtS+/V4UfPISrn X-Received: by 2002:a02:970d:: with SMTP id x13mr9778056jai.57.1629322222531; Wed, 18 Aug 2021 14:30:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629322222; cv=none; d=google.com; s=arc-20160816; b=VPQNaGPPkSg2XVCUz0jFwL053x2MOsVI2jRsufvy/wLczbnH5MaOcqkjlWkLvmwlKP EBeflm+Igi6zi9IEUNlbmkMVO+l97nXxcxf3GxWCPKYz6N+QEbq/huQUHWCtHGmGYIhe ynoQ30ttuwrmz4XJhL5jN0l8PaLWNvewHJz3Obkc6EDkeCl5teOTLH3dKSpS7uMRtKf7 p72/G0Wrzrahl2qLbmJVvIS2B6za6/ro/7qH6NA4ikC04APtN0m5GNQnDH0ADB0MPf7C U7JHHGuEdrrMAedsbzBKrCxKtV/UZep78ET1UITPvt2i82ESVNY1gOtODfVnj5o2ArEn 9zwA== 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:to:from :dkim-signature; bh=jLXGAbCLwSue+rsTYVcpzuuQk6hL0q5RdOPZ/L6m2sM=; b=hAPsLisiIjs+8Knx0gsZ0Gh8n4myIxyDAFHw7WAfTdEgWyVtOpWt0aw5bDKOhnFbjJ Csl47CIQY/9zd8F12GmZ7sDhlE0HbDk+IzlRk+4eEMkEJkDyIzOgH0glU2AANAs+D5Gh wbGk++lHZQWab4W8HeRzUB4iuWgFJmGJcz8Z6z3KvSGJKqDvVGuUV6fq0+wevw5T0S49 vBCmFOL0UpzIn19Rs3LNCZAmqRcDEnb4opLKBGc+QYBAL8exFZkmFfHdW40Tc7v528py kDel0uEFf5SFVAovBnAGYxbOhf+ExywvrB5u/YWccfd7bwRXUW0pu+COBd7uiMH60EfI bHxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GEdlg1sv; 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 c1si752755jap.87.2021.08.18.14.30.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Aug 2021 14:30:22 -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=GEdlg1sv; 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]:41218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGT8f-0005ou-U0 for patch@linaro.org; Wed, 18 Aug 2021 17:30:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGT7g-0005lj-4a for qemu-devel@nongnu.org; Wed, 18 Aug 2021 17:29:20 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:45748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGT7e-0005hg-PL for qemu-devel@nongnu.org; Wed, 18 Aug 2021 17:29:19 -0400 Received: by mail-pg1-x529.google.com with SMTP id n18so3705917pgm.12 for ; Wed, 18 Aug 2021 14:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jLXGAbCLwSue+rsTYVcpzuuQk6hL0q5RdOPZ/L6m2sM=; b=GEdlg1sveHuZngaKhebNtbyxZRKU5PtermHZo8ynQB+sprF+SA5qt9NRlNTuvgwghw QdvxlfzxuJzpmb6+b+ta1s8yvApaL3WhS5ORY3JHgVpeJ9APb20TV9GdlSvRgfPDH70p ugqAW3UrfDi/VKh1aw1xFxf4dQq6rWmFympO55TcYOcB/D/0g7jcNplkQV/yhRQoBil3 lWojFn/9lUTqsSBNUFXWL0Xs6g/XlwuTH7Z120MPHDPZP85FJaYGHMF/ZlnmhW1eJxc4 x7JbJVVkO+PUQtG6t1t5y2yzi+67OgAwkCM02Gnu/qd0vuY9+YvMHqHOo/nTzWCCJvVh hwBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jLXGAbCLwSue+rsTYVcpzuuQk6hL0q5RdOPZ/L6m2sM=; b=I8Ib45xLeTZ0+QyunePB1tMl59VIQSLFTPJPhihUhijS/0e721ArU5ENQrOCPSHV7h Fo+cxWR3gbVPDXaPzjrftJQbahkGgWeJdaxUfOHVKKwiaZqaSSkFqqt694xgjRM+fLUa TYlO9/oB9kBbDaGpQuE8KYbQq1B23W6UmFepPyxPiJAvKv5TEwXRbPzGu3EVH43AlANn 4uZkxLDczQYtVQmSdwkKnYMGR671Lme9rxTR9nMC4Jv+IClupqTpbxARyw+pbtOHsnA7 g3hDwV1wPG4HR+4dJZQC2sBMbJkU852Y7VaITBIzK49VHmlRCp6nfYhaTkfoXqbaLsQq tKgA== X-Gm-Message-State: AOAM5317rqOWFx7dCSaWHmpALdAN4qWeNdsPZeLcLKZMC+lidIOWT0Hy bvU2n589HcvuTGcskbPOHCF3q2CVVy/ywA== X-Received: by 2002:a62:9288:0:b0:3e1:c44f:a1b7 with SMTP id o130-20020a629288000000b003e1c44fa1b7mr11502539pfd.63.1629322157442; Wed, 18 Aug 2021 14:29:17 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id y19sm751965pfe.71.2021.08.18.14.29.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:29:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 03/14] tcg/arm: Simplify use_armvt5_instructions Date: Wed, 18 Aug 2021 11:29:01 -1000 Message-Id: <20210818212912.396794-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818212912.396794-1-richard.henderson@linaro.org> References: <20210818212912.396794-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" According to the Arm ARM DDI 0406C, section A1.3, the valid variants are ARMv5T, ARMv5TE, ARMv5TEJ -- there is no ARMv5 without Thumb. Therefore simplify the test from preprocessor ifdefs to base architecture revision. Retain the "t" in the name to minimize churn. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index 18bb16c784..f41b809554 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -28,13 +28,7 @@ extern int arm_arch; -#if defined(__ARM_ARCH_5T__) \ - || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) -# define use_armv5t_instructions 1 -#else -# define use_armv5t_instructions use_armv6_instructions -#endif - +#define use_armv5t_instructions (__ARM_ARCH >= 5 || arm_arch >= 5) #define use_armv6_instructions (__ARM_ARCH >= 6 || arm_arch >= 6) #define use_armv7_instructions (__ARM_ARCH >= 7 || arm_arch >= 7)