From nobody Sun May 12 17:59:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1710006747; cv=none; d=zohomail.com; s=zohoarc; b=RcivrYoPApF40Y8lC3siUFEQMu06GZIJgoyKwuaeBTJvE3eggMwsSJNDI+svPRfoinr1VFbdPFQmmFbbjXCqDQKZKhzTPd6QCajq1R12JcmY3PKnuoVRDYOuOHZM+AvCz76iu3Rr8SXAuQdlGRua0Yua8tcLu2SFcmPdwr7ipqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710006747; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pxxy6rYsXE+YgbqfLQwa9qOUOHg4ePBRyOPqmtL2n8Q=; b=C/K8HWTlnZ7mnrU0I5BnrFY5k/GyCy0afC/scusoZjgiBsvHPpC+j8EBq/0EyNJVmnVhuFrZawOrDQs2Cxi4CbW/ZMHS2QRVj1dt2sxFhsX+6zszLTclJPoqizeszIJngt39Ltdrr04hhHJamhfF+/wbJpjaY6DRu+hF9zzRDes= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710006747086907.6920435981197; Sat, 9 Mar 2024 09:52:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rj0ql-0005e3-Tf; Sat, 09 Mar 2024 12:51:12 -0500 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 1rj0qk-0005dZ-9T for qemu-devel@nongnu.org; Sat, 09 Mar 2024 12:51:10 -0500 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rj0qi-0004tK-R7 for qemu-devel@nongnu.org; Sat, 09 Mar 2024 12:51:10 -0500 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-5dcc4076c13so2086329a12.0 for ; Sat, 09 Mar 2024 09:51:07 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id o12-20020a170902d4cc00b001dcfbbb1ddesm1578556plg.7.2024.03.09.09.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 09:51:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710006666; x=1710611466; 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=pxxy6rYsXE+YgbqfLQwa9qOUOHg4ePBRyOPqmtL2n8Q=; b=DAEoAIuTkSeNkp6FY4+Ik2YIG6lZOc/bwHop7S8ZMywcd+AE31J+coKADvHDkAwF6L Z65oHEnJu0htjzqU1o3s7nop7QBD6FX8RgoLnc2vr8Jt7DTwzgIxBbxQfxcUujDhgwXp S96o86C4aQgPkG3lWEENE87h28A3+5yH3OPAuvzsZuW+0AZutV0WYqUr4jzo9y5UZcIA vOEE1MyTmitgVkjQ2aYogZWOTpQXZZEeU5uXz4ZLDfb8jcJM5dbFyrTC02qN4lUHmWav McHgB4xw8qeHbc98D2vkuF0WS5lJsPjD80hoghBJ+n4Qo+/TlzVWmlg0bkn1ZbMqdwTg fhbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710006666; x=1710611466; 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=pxxy6rYsXE+YgbqfLQwa9qOUOHg4ePBRyOPqmtL2n8Q=; b=GXOXK60Q9GtUQZEpuEIDoNcyDK7MaG2g611X0tqP8IFr4vGdunq/8qxf8xTe+SEdIZ HcdPnm2csjbdFcpKsm6SwG8ytVKqzcaM/W3qB30ilKTuFOAl/l59xLN2/oDDBMVyM1fH COPKp77SChnXL6cjC6q2jspTjEtRA7W81zYdo+F91WF9myzqlIe80MZUfj7V3tqiPiIM AFr7ilSWKoXJwj/3GToSuk4Kdh3siqIo1YvRDu6eVmuWc2WZM4P5RfYLBIpqXFqoEOmW 6/K/sSy6k3EYa5EA35K1wLE8uusq+NTWhj5bzkyxty2S43eN78kPYDpjOFvfI8jS2e4Y QKEw== X-Gm-Message-State: AOJu0Yx5kvJtH5ax4SVorDFh/znGwmnkymwAHbAtAxjFXvKqNLRWpjxU Cv34B4gyhy/aFAG8RCsoo8DILpkm6ureSaSmRhSyBhUkPpVgjhuOV2BJB7YlyYK2+RzcF9wip60 E X-Google-Smtp-Source: AGHT+IEx+bOvSOwMHksIVFxcsgcSP4rxnsTSVAF28Zp9s46pJ2NEMUab5ccR70BSrvz4juisze4qNw== X-Received: by 2002:a17:902:da8e:b0:1dc:6b26:d1cd with SMTP id j14-20020a170902da8e00b001dc6b26d1cdmr2951651plx.2.1710006666317; Sat, 09 Mar 2024 09:51:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.maydell@linaro.org, qemu-stable@nongnu.org Subject: [PATCH 1/2] tcg/aarch64: Fix tcg_out_cmp for test comparisons Date: Sat, 9 Mar 2024 07:51:01 -1000 Message-Id: <20240309175102.726332-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240309175102.726332-1-richard.henderson@linaro.org> References: <20240309175102.726332-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1710006748816100006 Content-Type: text/plain; charset="utf-8" Pass the type to tcg_out_logicali; remove the assert, duplicated at the start of tcg_out_logicali. Cc: qemu-stable@nongnu.org Fixes: 339adf2f38e ("tcg/aarch64: Support TCG_COND_TST{EQ,NE}") Signed-off-by: Richard Henderson Reviewed-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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, T= CGCond 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) { --=20 2.34.1 From nobody Sun May 12 17:59:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1710006760; cv=none; d=zohomail.com; s=zohoarc; b=FrlpiQxN6Cu0xeRTVZO43pRRSvhYlfaE4UqOJPclGqF4BvkDVHw8x5+4PIU/GcQT9++1hFtkXlu8iij/jEp2J6jGlgUXWzzIiMDDT/Pj01sq4Stqy8RnmzddFe2cY+A6+AyqokdenUAyp41E2iz5JKW08Ku8rxWL42uoM1aZ1LI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710006760; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zBOpPFxa99oMMIr44Hfw/UhqA7O7Buk86zQ/3jKmdU4=; b=ifqbv1YbD8Zf+mB+RLsO5g0uAX8Tw2Ii9DqYCrgaEVL2JSNOcLq3hj43asE8mFAsKt0gAVt820qCdNQtr6l/6UxHg0vtLCOiJ+ewKhz0REQuhSgO6QOZ/UjObzsg4GCE+KJ1oKMFExSyPlVCh5VCRdpMdBnpi3ji1FHEKjd9kd0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710006760150911.674136540974; Sat, 9 Mar 2024 09:52:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rj0qn-0005eu-Lb; Sat, 09 Mar 2024 12:51:13 -0500 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 1rj0ql-0005ds-FL for qemu-devel@nongnu.org; Sat, 09 Mar 2024 12:51:11 -0500 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rj0qj-0004tT-BJ for qemu-devel@nongnu.org; Sat, 09 Mar 2024 12:51:11 -0500 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-5dbf7b74402so2364573a12.0 for ; Sat, 09 Mar 2024 09:51:08 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id o12-20020a170902d4cc00b001dcfbbb1ddesm1578556plg.7.2024.03.09.09.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 09:51:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710006668; x=1710611468; 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=zBOpPFxa99oMMIr44Hfw/UhqA7O7Buk86zQ/3jKmdU4=; b=mtDEdYhuz3U155cz6PaeY6y7Gf7j9QQgxAq5skriq5jf5xDzXn8qJBlLpOmJytmnBX gCsvxzGSV1TISdHYqZzAigE1Hemt0DdUCEDYDCzZeaZXQzQmx7JBrgiRztcuDkaWc7yD ClNYxfA8UQ4PhrHv2tuQFN9dDh1pbSWiK5S02fJJd6BFDGSnaTuyeB+QgMYgyN55D4Fc RfjTIgHCLfNzLpDcyXHPnNlH5/gAO4rvR6FXIiTJlhTmbaV0h1qKHbbGw5FnbBpA8O6Z uiX2gB9ZjtIzGVLug4cUXtdODklHm4+kdzqSuxwe3xp8wugQuRkCbDAHxi9lYsjoFglN LGFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710006668; x=1710611468; 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=zBOpPFxa99oMMIr44Hfw/UhqA7O7Buk86zQ/3jKmdU4=; b=d8Hb5u/GVCY0BPe3ww/Mra9Sq2jX0eK3oEHL0kAbNHuUQaaM/I5jrVsYyZ+TkSKJSh FJ1mN6GPxYyZ5HFRat2fNnZt7Mj7VEbEePfhnCtwG/nd+Gk0mMaen5Wzk+xYBCZJmUKH cUXm0Oe+mNfo8DFM4Sk5bKxL8CpWrvuML13VThXX8CHcgvvJoLUPH46G0zdWGScLRrnc zODab2ZcyS3SSX0c3UByD6j9sRuKyGeGLLLiM5+HBDAYd5MfHgflMgPILbMmuG8yJJsa ytnYp1ifXWzOqkisKGrl/WsDiQ8wAgEFmqH+bAHRJuSAb1v7WntKUmBaZ7OdY5ii0/dm WQYA== X-Gm-Message-State: AOJu0YyrhOojpSaeoR3AlOYBjAntgt02YMjZp1Tx8TqoxUTMWydQstim OTWcdoz4+vCbLYCHpbGT8yqzFthBXooKBDFsyzHDdMs7Jfefc35lUjl/ePo7k9LEaOm3S0J/FJY 8 X-Google-Smtp-Source: AGHT+IGQwhZG2YWW4FS96ffwK9Y+/S6qOjRaDO89ASR0XvIwU91Kyh71xqE/tI7W2XHMo697mlEFBg== X-Received: by 2002:a17:902:e804:b0:1dd:7e09:45dd with SMTP id u4-20020a170902e80400b001dd7e0945ddmr2249247plg.19.1710006667738; Sat, 09 Mar 2024 09:51:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.maydell@linaro.org, qemu-stable@nongnu.org Subject: [PATCH 2/2] tcg/aarch64: Fix tcg_out_brcond for test comparisons Date: Sat, 9 Mar 2024 07:51:02 -1000 Message-Id: <20240309175102.726332-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240309175102.726332-1-richard.henderson@linaro.org> References: <20240309175102.726332-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1710006760826100003 Content-Type: text/plain; charset="utf-8" When converting test vs UINT32_MAX to compare vs 0, we need to adjust the condition to match. Cc: qemu-stable@nongnu.org Fixes: 34aff3c2e06 ("tcg/aarch64: Generate CBNZ for TSTNE of UINT32_MAX") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/aarch64/tcg-target.c.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 38446c167e..56fc9cb9e0 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1464,6 +1464,7 @@ static void tcg_out_brcond(TCGContext *s, TCGType ext= , TCGCond c, TCGArg a, case TCG_COND_TSTNE: /* tst xN,0xffffffff; b.ne L -> cbnz wN,L */ if (b_const && b =3D=3D UINT32_MAX) { + c =3D tcg_tst_eqne_cond(c); ext =3D TCG_TYPE_I32; need_cmp =3D false; break; --=20 2.34.1