From patchwork Fri Apr 25 21:52:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884449 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4177319wrs; Fri, 25 Apr 2025 14:57:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXA2rfYWx6m5XucgscyLDF+7C/mh7ezP2tRArss6p7WwM5m+3pr49p5zX2oa5ts4KVn5kpRAA==@linaro.org X-Google-Smtp-Source: AGHT+IEx+MvBJTIsMyQ/0Y895dUg6JIkzMIkoQX625+rjCLxlz3xDtBNLY1KZ5+NV1CAsGwB9Qau X-Received: by 2002:a05:620a:2894:b0:7c5:4c6d:7fa9 with SMTP id af79cd13be357-7c9668d0d67mr214115185a.49.1745618262390; Fri, 25 Apr 2025 14:57:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745618262; cv=none; d=google.com; s=arc-20240605; b=JXCSqytCQEy4dBc9waEcDPabmdKwNPXijBPQibfjQ2HFaEwCGvONM+BCfzyYYS+V88 4LRYSV2WChLqLFiKNPgjPb30l++AnpUs5jX3VbECrlikmqJFIrlSFlI2I/U8S+MMVOXQ v9DDWgE79uU5lzLRV6vZfnslT69nfGZ1H1IxQTEZsbRiKQ7SUYye+BxGiiWOFkJOstZs MluGvURhm+CB0zuOLiX7BPDux09FSQcdzT+h4kexv8aX+f7l6nSkauQvW1L2yjHrZ8uX t71J0rZwQpQ+jnsOlDLPfFdzDNfWf64v5zis7+lnFgdFfUgDDSOZLK37J8VH//PE6Q+M SolQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=AHpl3TQ1gAJNluoeZYF2B9bVi2xRa/fgeCq2ywDqjJY=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=O1WgOkIoWHTpEw+RGsGB7mGRR2Wq5gzPmHUbqO+7Riykk7XfRGt0fcNfXe2r4XqxEn AEcg0yqFWAejjbZLQjy4Nzg2GCFKCdSPF2+uOw6Dml97JFerHRPQdsu4tNksoTAFDEoc LfMHrr4f29T8eAP6QP/ow++oO0Wp8ADVZfCmcpU7Tmw9CtQystDl4ql0YP+FVUGsSiuQ zb6n5acuZWDfPDhxoUalnlScRgQ7Fk6Rr4xb82MBt/yhYwX/NOutCWC/vtCJfhUViZ0O xCUZLkCl5v/c0x/nlFoHKbpCDVgAH4KMHV+kTrB6hK4LFs4ci5mbngImGrLuXdSVZ9Df 2EBw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UnxesSJL; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958eb8d44si428179785a.540.2025.04.25.14.57.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 14:57:42 -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=UnxesSJL; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8R1C-0007dR-Ax; Fri, 25 Apr 2025 17:55:34 -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 1u8R11-0007XW-E2 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:55:23 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R0y-0000ZU-D0 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:55:23 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-736b34a71a1so3225228b3a.0 for ; Fri, 25 Apr 2025 14:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618119; x=1746222919; darn=nongnu.org; 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=AHpl3TQ1gAJNluoeZYF2B9bVi2xRa/fgeCq2ywDqjJY=; b=UnxesSJL+IfGdUN1k98LRvkk/8UcnmqYiQ3cBWdOX05/IGsmC+fu9HnWVpz6cIqPDK qCsj8jYwXEM6O4DBuxW+Sxi5r2GiMdV+U+Ml9ppLLmH4K8KRX5u+et9fid+q7k4l2ncy kiYJLenUx3ZQEkZyeWuaxr71TRZFnktitNonw7WsXjM6VZAzMLgURmnsXozNe9oYTsdc DFQL9Q1+YfOq8oSOvwXiLdgEOTatrYui/wnljdx4MSxW+EFDAD4pIXehGWTXT33mx3qz ltSMRjXPQz521JDlKvVc4sOeBxd0BhefHcTy3M8a9mRpa9gMBt8FnMBMjJy8Wxs5ZbX8 gLWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618119; x=1746222919; 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=AHpl3TQ1gAJNluoeZYF2B9bVi2xRa/fgeCq2ywDqjJY=; b=GYLEdvUKiSJSNBBP/jbMaXD2xq9a2rnKX2SRRF7f/pg6HvvzEQnfX8JPL2HhDNTnI6 hMRJslt0UGo9x69nBOweXCvSCf91m1pL6/hJHdy8B/acXeTZI91LGIVEUFpufzk3Oijy I/BDTkMXpDFPyKJ63CQsmbwGSexy5AbL7wvBvjKZwQzb1RMyJ8E7ZJmlzTczphb34aBq RCc/NQuLxZmbsKDOAPO8ZKkSP7VHRP6ZCqO89SQ2liT0SuxeEoN/O/aKuM8z8AK/2Gos kTGLzKaPIFT+tinUzynJHORMFv9EArTmOkIY6ycIOBQNuMhgwEW4nnWPumC7XDlVybbs b5lg== X-Gm-Message-State: AOJu0YxRdyoSixSVUbK4XIWQF1EnwMphRH2XWwYl1/6tV+tqJIiRLN6N 6OkoIotkpwHVLPJhIMx33o+Pdr43cGur9yE/Fkctbd9+eVJpSD5GVgEyN+OQ7wLgZCbtnCE41EU Z X-Gm-Gg: ASbGncswWdXoBKrFiwfNbBwu807Ei9C6NmfPGUwVP9dMoyHU8CFmQ8MEp+Yoq1U43Ns 6SzhPxF/5QqOM1obBy8LMktkGPxz7AZqn3B/9OBtv5qjp/0aFRn1veF9Q2KK12YrFjZxn7s9aS9 QK/StJIzzSJqbaJXAZUnXy1SQCEJQfnWgLinzu6B6SZ4A/AEBLewBPPiYDW0qiCKya83WqHrXiP 1Tug/zZ7NSZREncOEiR+S2u9/TadpmJ4y8moRykrq522qFbqQGGcCQjuFaiSMXWOF/9J8PzP2cS +ZKTdrxFHxz+qur4FxtP6oVsh8VqGlpj/X4eD046nBU9FA2P6SpNhoaz9LBCjL/ZxZOq2BAEfJU = X-Received: by 2002:a05:6a00:3a15:b0:736:ab1d:7ed5 with SMTP id d2e1a72fcca58-73ff70d05c8mr1504289b3a.0.1745618118916; Fri, 25 Apr 2025 14:55:18 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e259414b0sm3664392b3a.48.2025.04.25.14.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 14:55:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 032/159] tcg/arm: Fix constraints for sub Date: Fri, 25 Apr 2025 14:52:46 -0700 Message-ID: <20250425215454.886111-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425215454.886111-1-richard.henderson@linaro.org> References: <20250425215454.886111-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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.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 In 7536b82d288 we lost the rI constraint that allowed the use of RSB to perform reg = imm - reg. At the same time, drop support for reg = reg - imm, which is now transformed generically to addition, and need not be handled by the backend. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/arm/tcg-target-con-set.h | 1 + tcg/arm/tcg-target.c.inc | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tcg/arm/tcg-target-con-set.h b/tcg/arm/tcg-target-con-set.h index 229ae258ac..f46a8444fb 100644 --- a/tcg/arm/tcg-target-con-set.h +++ b/tcg/arm/tcg-target-con-set.h @@ -30,6 +30,7 @@ C_O1_I2(r, r, rI) C_O1_I2(r, r, rIK) C_O1_I2(r, r, rIN) C_O1_I2(r, r, ri) +C_O1_I2(r, rI, r) C_O1_I2(r, rZ, rZ) C_O1_I2(w, 0, w) C_O1_I2(w, w, w) diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 8e9edeb7c6..47c09ff2b1 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1984,12 +1984,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type, break; case INDEX_op_sub_i32: if (const_args[1]) { - if (const_args[2]) { - tcg_out_movi32(s, COND_AL, args[0], args[1] - args[2]); - } else { - tcg_out_dat_rI(s, COND_AL, ARITH_RSB, - args[0], args[2], args[1], 1); - } + tcg_out_dat_imm(s, COND_AL, ARITH_RSB, + args[0], args[2], encode_imm_nofail(args[1])); } else { tcg_out_dat_rIN(s, COND_AL, ARITH_SUB, ARITH_ADD, args[0], args[1], args[2], const_args[2]); @@ -2234,10 +2230,11 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_st_i32: return C_O0_I2(r, r); - case INDEX_op_sub_i32: case INDEX_op_setcond_i32: case INDEX_op_negsetcond_i32: return C_O1_I2(r, r, rIN); + case INDEX_op_sub_i32: + return C_O1_I2(r, rI, r); case INDEX_op_clz_i32: case INDEX_op_ctz_i32: