From patchwork Tue Mar 12 18:41:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 779782 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp2169374wrt; Tue, 12 Mar 2024 11:43:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWoTJAz38gGGSeUYafIZwHb4QSezr/3/L6KHRlB6RaBUU9RfrjONy/SwZtP+KCTcGJNYfs3YEPgoYEI9A4iQuu9 X-Google-Smtp-Source: AGHT+IFG05q0NwB1ckt7O0oE2zgDoKfHNxHSlpga1HI59TFHPo1neEU4kH1xDPwHL0zRRL7XWaie X-Received: by 2002:ac8:7d04:0:b0:42e:cba4:f9fe with SMTP id g4-20020ac87d04000000b0042ecba4f9femr14207501qtb.2.1710268986626; Tue, 12 Mar 2024 11:43:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710268986; cv=none; d=google.com; s=arc-20160816; b=Xn9BIPu5IPAQVX5uC5FoTAbijzn14XPP1q4RFQF1XQXnH2SlyZw9PnVmByeN5n9420 +SajTbGFfJIkHM1eGAVlhzlSpqoGR4cv2xPb3/Vd9ZiKrcaW9hxsxNeEM63fb4DncMnN U5cSKAJnWZXzxLeFoNJ/5DbkrO6rIx/8d7qHV4eITHqrti5DPpBgiTXq8XCGL3EoYDUA ZZiX5JwAekq2I0gwPGX1Q+TpQBYgpdiP9QTjMgy3dMQ4Gvtns2btHZrDGoHdmZHP0BSC co9DJNyDRVVd9TObuMVEohgPqiA9S2O4XAhB2DEWsaALQz25xaHEIS6d1sl5b7lVje/N f0KA== 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=x3znfmNL10eLlxG5NYqWnRcVawBnQ4i751296Itk41Q=; fh=G4eF9GtkP2UMeW1yAo6Yg+WDlYpqokuFRklCXUMdnHU=; b=dcomnWYyBQcnIF3RmzsOUWWsbAAm9k6Mnrz9hwr+nUf842JoVbXvy+1MlcwcPzuo3D VM0/14dAPZeK7we6NWsu/UvqgR1gyD7BoIpxVP7EeJakm/m5Krt3bsNCqwraG99x5sBG cJH4vlHxQ0Is7sgEUJP2y9in9WBNzc0AVn1rNcx4bWugCYL6xlwPEG9SBFfv4IVQxgAT 55ymWzMkVYsDoY4LoS2PjmERe+K2F6cB8IXjDSTrA7K6w3sv4ck5Q5Ayf6GOMYIFGzwB j7i/fOrSvJEH77rXsZ+zdcYbbFsuXBFXOHZlE/hGBe5WTDPNKTH7CwMiWWm6RvzyhlEh Ujjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z8OJwFWs; 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 bp40-20020a05622a1ba800b0042ed89af418si7999655qtb.112.2024.03.12.11.43.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2024 11:43:06 -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=Z8OJwFWs; 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 1rk74K-0000Vb-Gi; Tue, 12 Mar 2024 14: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 1rk749-0000Oj-E7 for qemu-devel@nongnu.org; Tue, 12 Mar 2024 14:41:34 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk747-0001NK-9z for qemu-devel@nongnu.org; Tue, 12 Mar 2024 14:41:32 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1dc09556599so48619115ad.1 for ; Tue, 12 Mar 2024 11:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710268887; x=1710873687; 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=x3znfmNL10eLlxG5NYqWnRcVawBnQ4i751296Itk41Q=; b=Z8OJwFWsDF/tj9sOZgxNZ9rh6WJMum95sYh9c/i7bxmptTDfemZXA1oBvlyTzEHbIi RALrOCi1LlO3K7Zotpwl0Pvd1eHeTXg3tiJTe7rEItKkGrG0Ooh3Cyi7eiOhJOHA0sSx KMR7voa4SeymqrodYUH1dDisfTpT/up0ET67yNki1CrTxwT6sSEROzjU9oW2CTyP8Bvq 09BvLjZvdpE56iZKNd26NcSB2t2mNkL19ZLtGmm6AO6lgYQdMERkoa4VCJIRmgvqWpwJ PotsB5sCO74a+SKhQ656xFO9VkGSqU+jfR6w8RrEokk5o7sce2xE4v46OieDf70pbPWO URlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710268887; x=1710873687; 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=x3znfmNL10eLlxG5NYqWnRcVawBnQ4i751296Itk41Q=; b=FcmAJrXpL6IxdTe0X7L/EtNGUdJdX4a4Q9Qgb0+4h7Ak9fXT3CwLn1vdTIw7SJFMBa sgyvwiZ3vdX3JDRLYogXJFnqL1RH+hXnNB6XfqCC/f51ww6omnROkBmeHU2uQiWVOCPx szuqt0x9jgFdRM5Y696Sdcb48JJ18m8RQMbqlDrfZUqaqBTI7CD9XXw88yPADIqkf9LP DF25+0Q42rhuk3u8DLjh/3EOrCqX2psJvF2/bFPPmHZ3gcG1FVVDq/frXCxsZBZzN3U9 9Dfx5pBpdTlZGA87BMc7d2727C1kzqkaGYqJYmC7f0ti8tp7TBpjPVR0U+aua+d3+3dy jIFQ== X-Gm-Message-State: AOJu0YwN139S0+PbYH0k8jbv1Rxjleq/3bhxSMlbfYedI3IHS8t0V1Mb zJtiVXcHHGV5MaUv3DrpfBuv9VjM+HLCreoDCC2a/FLy7YnQ1fEImVZy3D2xsosr1UPrv6IBHnu 8 X-Received: by 2002:a17:902:cf02:b0:1dd:a529:f355 with SMTP id i2-20020a170902cf0200b001dda529f355mr4948777plg.10.1710268887303; Tue, 12 Mar 2024 11:41:27 -0700 (PDT) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id b11-20020a170903228b00b001dca40bb727sm6951739plh.88.2024.03.12.11.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 11:41:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [PULL 7/8] tcg/aarch64: Fix tcg_out_cmp for test comparisons Date: Tue, 12 Mar 2024 08:41:14 -1000 Message-Id: <20240312184115.365415-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240312184115.365415-1-richard.henderson@linaro.org> References: <20240312184115.365415-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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 Pass the type to tcg_out_logicali; remove the assert, duplicated at the start of tcg_out_logicali. Fixes: 339adf2f38e ("tcg/aarch64: Support TCG_COND_TST{EQ,NE}") Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index dec8ecc1b6..38446c167e 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1388,8 +1388,7 @@ static void tcg_out_cmp(TCGContext *s, TCGType ext, TCGCond cond, TCGReg a, if (!const_b) { tcg_out_insn(s, 3510, ANDS, ext, TCG_REG_XZR, a, b); } else { - tcg_debug_assert(is_limm(b)); - tcg_out_logicali(s, I3404_ANDSI, 0, TCG_REG_XZR, a, b); + tcg_out_logicali(s, I3404_ANDSI, ext, TCG_REG_XZR, a, b); } } else { if (!const_b) {