From nobody Fri Mar 29 05:09:28 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=1685067223; cv=none; d=zohomail.com; s=zohoarc; b=S9LvB1Y/EDB0dt01A8b99UatlpjgzhtK7TnnxAZYNHnJ5ef7V3s8kEoLnxa2cR0zY0N2i8cAkRsU7EsRuhh/yWU06Fm8y2Edeo5ev+W7BkTC6EchUT+5vVRZ9xbYdHS4LIDt1SLHI2KYkgyNc9nuViIBEZqA+HXFx5lDA+7bVLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685067223; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lIrHyv+mgsH/mPrNHKwXz9RtxdnCU4H2P2z5QfKtbdI=; b=c2waHgmA1zqCy3dGbmTgTkhDXd8n0rgaa2hHxtJhsoK73222sY3PpN2ecgEWE/3OldRGn+S9YtsD7P9FxkjTwtibmZNRuRssMpofZ+O4TEXR7S9z5wu+AIdGfHzNVLltXEqCIGKsT3giRReocmc07chgf4+n4KLxvgeVLcG209c= 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 1685067223692536.455945839186; Thu, 25 May 2023 19:13:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2MwW-000262-4o; Thu, 25 May 2023 22:12:36 -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 1q2MwU-00025U-SE for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:34 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2MwS-0004se-Gu for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:33 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-253e0edc278so297240a91.3 for ; Thu, 25 May 2023 19:12:32 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:7ac5:31cc:3997:3a16]) by smtp.gmail.com with ESMTPSA id oe17-20020a17090b395100b0023a9564763bsm3594086pjb.29.2023.05.25.19.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685067151; x=1687659151; 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=lIrHyv+mgsH/mPrNHKwXz9RtxdnCU4H2P2z5QfKtbdI=; b=foZhuYfCxX6IZpZyS3sZiiS2zCZFzBIqOJx1vtRBVXdASiQi8+qrVY6otKUBDO+AJN cb0TnByRp9DDowAYjh1jLJZtmiQbY0YKznLMar8g5EVkVbTYZIink4hrEsiXqcDxHAl3 7PV/f49Ko8jyN/rnPSJZjlcyRuqZpOPwa1FxCqAgFvVYL7o35Pv2sX5kUg3yiLFTgpeR 466+tW7fHNBM2Xr4T8phcOXgBpPaJZh6vjo9N7fvXR9tkQTY7QRq5qv02LdnmhlqsUwX APy4avmLcINGdUUTLBzBcgcW4m/ZdEYuow4o5JrMGYp1GcwRMOnQDT6dCbnlbzVRzVAh hjcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685067151; x=1687659151; 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=lIrHyv+mgsH/mPrNHKwXz9RtxdnCU4H2P2z5QfKtbdI=; b=Aes2BxgXKyVITveZFDt6Lb1nnkMU7VI6tuuQ4u3s7r3wSC6bJXJoWapHkMULAOMLQW V9Z2sT+zOfjh2DiIzOtzvyHtlcR2wDO1yeh3ndHBqhlpVZywQ8GEpRU/dyLYBrL+hrtB 6pgJbQ6JZaQMKVy1UcN8VmvC4XjoAULSn3D1HfszxS5Ayk6RxPvB2iKp80TIb/5jt+D1 tRnhxGYkkjjyAKfseBmUGK8Qcg5aVOA+qSaYH0rwaLVv6rh9XUJCiXs+F4zZM8zuvgxg 0fRw4cFUJVBcIVvm2fg7N+0rBJV3iBwBpsXTGEewFgnpqf/HPhFfXkRFG0VyTK+2w0ss 9RxQ== X-Gm-Message-State: AC+VfDzKiFrxOL259BMZCcFbDZCEyqoeUDPSnHbIqUjGyW+XtDS1jlcg DWYcNSF3ILOQ2FyD4nkiXf2xvjyn7wIKK/bMHyA= X-Google-Smtp-Source: ACHHUZ6+FArRVylL7AhqiUt381H5aRaH3DhFIPoi+onlB90RqODEZPX9gvlYPYGqhjkSuqtUoR9xrw== X-Received: by 2002:a17:90a:ea85:b0:255:b1d9:a206 with SMTP id h5-20020a17090aea8500b00255b1d9a206mr706126pjz.22.1685067150878; Thu, 25 May 2023 19:12:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com Subject: [PATCH v2 1/4] decodetree: Add --test-for-error Date: Thu, 25 May 2023 19:12:25 -0700 Message-Id: <20230526021228.1777917-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230526021228.1777917-1-richard.henderson@linaro.org> References: <20230526021228.1777917-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::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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: 1685067225109100005 Content-Type: text/plain; charset="utf-8" Invert the exit code, for use with the testsuite. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/decodetree.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index a03dc6b5e3..3f9f6876f7 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -35,6 +35,7 @@ formats =3D {} allpatterns =3D [] anyextern =3D False +testforerror =3D False =20 translate_prefix =3D 'trans' translate_scope =3D 'static ' @@ -71,7 +72,7 @@ def error_with_file(file, lineno, *args): if output_file and output_fd: output_fd.close() os.remove(output_file) - exit(1) + exit(0 if testforerror else 1) # end error_with_file =20 =20 @@ -1286,11 +1287,12 @@ def main(): global bitop_width global variablewidth global anyextern + global testforerror =20 decode_scope =3D 'static ' =20 long_opts =3D ['decode=3D', 'translate=3D', 'output=3D', 'insnwidth=3D= ', - 'static-decode=3D', 'varinsnwidth=3D'] + 'static-decode=3D', 'varinsnwidth=3D', 'test-for-error'] try: (opts, args) =3D getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opt= s) except getopt.GetoptError as err: @@ -1319,6 +1321,8 @@ def main(): bitop_width =3D 64 elif insnwidth !=3D 32: error(0, 'cannot handle insns of width', insnwidth) + elif o =3D=3D '--test-for-error': + testforerror =3D True else: assert False, 'unhandled option' =20 @@ -1417,6 +1421,7 @@ def main(): =20 if output_file: output_fd.close() + exit(1 if testforerror else 0) # end main =20 =20 --=20 2.34.1 From nobody Fri Mar 29 05:09:28 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=1685067199; cv=none; d=zohomail.com; s=zohoarc; b=LPj++orn6J7GSm5/Le2VO6X4oT40E/dxnBTUwp7fPXIeAzCXQ1kce2iTTGt019RMSEUoqQ7EbDiyJJbk7WNK4PsfgBFuFjT39lheh+hGu8PcW5ydAEu7KbJf6KHbRL3WJ8ngji8renptBwgBuTVuhO/s5R8oxU9cpW818GAJT4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685067199; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lFF1s6+sMccjm/JJjgUTIY2lXRrgEsfEba9Cc0AjjNI=; b=COHgdZE8Y+99ZhHum74P8wK7pjQHrnykepfyEcxG9cy7qxhSr1Xpk4ZrUT9GUXiOOx1erGUeWSSxBMj1cAGE2TD18nmFRprX+eSLxtU6JHuKT7RouCKYAU/XEtip+U4ZsLEvhdpyiRRDvlSO/Y0zXIbDYE0DoMlOdOtwDA8+8h8= 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 1685067199761454.69673038732117; Thu, 25 May 2023 19:13:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2MwX-00026W-SO; Thu, 25 May 2023 22:12:37 -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 1q2MwX-00026J-0l for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:37 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2MwT-0004sk-LL for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:36 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-64d341bdedcso318470b3a.3 for ; Thu, 25 May 2023 19:12:32 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:7ac5:31cc:3997:3a16]) by smtp.gmail.com with ESMTPSA id oe17-20020a17090b395100b0023a9564763bsm3594086pjb.29.2023.05.25.19.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685067152; x=1687659152; 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=lFF1s6+sMccjm/JJjgUTIY2lXRrgEsfEba9Cc0AjjNI=; b=Fr8f/PSp8vII4UuGLkA66TEMM59FKfvkeVvsujvOZp0RyG4XNbmBJVTTMpB7Wbxyhc z2KKj+bbnfd6BadfbFvgO+uuTP0wB/w4LKlE9D+CtRym8vd3r+c1VI73a5+pnALNZUX1 V8p42gtnpbd9Y6/DIuctNR5CZR22g/xD46bzm6slEUO+PMIYtpvK3Ps9clrveFX6blF3 cCjbJFZM/vA4QQbqt2KDLTtzgusdJ6w/LYbaNZpSBlrghVEd7tS/pEjGwTqYkjBN39TJ q75XXXWmJZHd9CONv6yovvpFbDX84H/sv4AKM9+KKCr5d57Ox6YxR4bUq20N9eGa7BJa s+TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685067152; x=1687659152; 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=lFF1s6+sMccjm/JJjgUTIY2lXRrgEsfEba9Cc0AjjNI=; b=OK0iN3SP45hhvyZPxfJ2S642V38wL4sWShKDHSMws6EKxtMQnYbT/tuxPAW4wocthD Zr152p/w9/hIsHg/HKXtIxBupCBrO/JXCnqlEXjZi1sy12c1sIXJn1gR+WsM6zzEUaKi spoRX5qzGfoGitdmZriYxdISLKzUrdfBCMSqSNyEZKJ242eBczeaB3Zfog8EZ96ZLbh+ Ce3GbUuYF8/mQntP/rhHZ8OuUuBMfUKqwueToSLIFM1A/wYDN5gQZCY7Lw2bZz2Px5A9 R1us1204mfcVvKKCtojXBRDeW91g8hgpZV7viau41xV80SQoSybO/gQQj0ymcuUgz2yF C/Dw== X-Gm-Message-State: AC+VfDyTvFQhYYrqO76Ouuhusuc9ceQJKDijEwAjM16D5crqDls5gTM6 BHyXNLHxIb1HhSVcUuhQxD8yKIf038azjbf+Wtc= X-Google-Smtp-Source: ACHHUZ5YchKzlbgsoFXV7bG+UwBQfM3nIHwwY82iUKGyoAyHOmoRUqeLrwQkGUc3ETDiIsKVykKleA== X-Received: by 2002:a05:6a21:3704:b0:10f:9317:153a with SMTP id yl4-20020a056a21370400b0010f9317153amr130874pzb.62.1685067151770; Thu, 25 May 2023 19:12:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com Subject: [PATCH v2 2/4] decodetree: Fix recursion in prop_format and build_tree Date: Thu, 25 May 2023 19:12:26 -0700 Message-Id: <20230526021228.1777917-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230526021228.1777917-1-richard.henderson@linaro.org> References: <20230526021228.1777917-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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: 1685067201174100001 Content-Type: text/plain; charset="utf-8" Two copy-paste errors walking the parse tree. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/decodetree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 3f9f6876f7..e2640cc79b 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -474,7 +474,7 @@ def build_tree(self): =20 def prop_format(self): for p in self.pats: - p.build_tree() + p.prop_format() =20 def prop_width(self): width =3D None @@ -624,7 +624,7 @@ def __build_tree(pats, outerbits, outermask): return t =20 def build_tree(self): - super().prop_format() + super().build_tree() self.tree =3D self.__build_tree(self.pats, self.fixedbits, self.fixedmask) =20 --=20 2.34.1 From nobody Fri Mar 29 05:09:28 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=1685067187; cv=none; d=zohomail.com; s=zohoarc; b=Yz9cIUGSsP3RkApkm02DyGRG1fEY6+G1D66ruVhYNdXASkahObKA7nXOSQp7XlfI+BhoeXJvYM6+2VyDTSXFPKBtMo5GWr+UELv9lSnNc/CJBdqnD7aoLWYbpwKT4Ez+wZG6HSpcmJn8Z2BuThwChNdKxF5IMBum3fxxQFu0G3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685067187; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MGForFNpx0ZhyGhYah3l6/MGE1/x6CdLWPbICDlT/bs=; b=fmug0L8KEJiJCMhtyyVtmE8UD2Yp/dRRLWZLgS/BAlBaMAmRkhfN5Qdk4CXpsmHkOrUTAmjtSN+FHWvsd6XqCbPcwoEm+293DbvSh9cylmSxP+hhy7lIDnws4jkqjj1ge/lB82FB7oDvbGnr112Fur7s5fd6KDJlIvK0pJMjLtw= 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 1685067187092206.71045275106064; Thu, 25 May 2023 19:13:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Mwd-00027B-Hf; Thu, 25 May 2023 22:12:43 -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 1q2Mwa-00026w-Rw for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:40 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2MwU-0004ss-HS for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:39 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-51452556acdso131154a12.2 for ; Thu, 25 May 2023 19:12:33 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:7ac5:31cc:3997:3a16]) by smtp.gmail.com with ESMTPSA id oe17-20020a17090b395100b0023a9564763bsm3594086pjb.29.2023.05.25.19.12.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685067152; x=1687659152; 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=MGForFNpx0ZhyGhYah3l6/MGE1/x6CdLWPbICDlT/bs=; b=kDDeVxR/Z/lQDoMSHQSRDCLRz4HRJ9XZhbdKHi8+Wsi8ObZ4OVSEIJhZmyAzPBcOmq HNAqWrVFkz8LjTdeSV+eB4ZAfw4cDz53GKGD3a6JLtgMhGhFVU19e3PGq5gEpZeCTjdo 6ICALBAtkBj6Rquf0nckiTo8gyrUJwKKmgceOSfct88YqPqkCpI3tDJvwBqrQG0SEY2L zonXtOjUwiip0Ho6HyhULQA4AhTNAZ/tA5lOlbugI/cEzp9p3r8fTYK7GVNcaOXyPfEB 0OQHu16Mm87eVSt8sZHpiqKx4ufV4ghBWqfaee7ekXHJ5sf2NQCtO5fsJRfsyTVm5dlo NJtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685067152; x=1687659152; 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=MGForFNpx0ZhyGhYah3l6/MGE1/x6CdLWPbICDlT/bs=; b=jxlmxRlFyBXY8ToUUBAHpQv9uE+5or6Tz/IyunusQlQ3iUWjfYdacnhfgGH0IQKGaF WdojhCujyEuhbYR+XbQLgAi96iTrCAfedbm5PaHXIwCDCufyt+8kzmeqJMqfIsit/ZIV 36OfzZViQHTlujp9ZaDJl0t8tj6w0VEzDluSlaTHOL//ve82UUV6ykq/ClGoEbZHI4ar 1CXJIv11tFDFMuaO01MFogD0MU9J6wJbmdwoOsePJYBu8VUuAL56KOMwl/OTDSIrKfVO b4njSCZwt/HkRkH2vZWQwpIumzHipebdj+UeDccaeFWYL1+luIOkROsplWPA+rch/c+K Xj/A== X-Gm-Message-State: AC+VfDylHb6IkzO9AGqxzcZ935KNFRiZ1fUZoDqzklNL89+Ujo5frZ3E KduvbWBbNN+lcG8gsxT6yT9xPIrhvEMDA58LaCw= X-Google-Smtp-Source: ACHHUZ4oS6kFdqj8GNqGkGElTA36hlnJ1W98Muy7mSFW3/YB/+AgGWs1zXaZJwzmObmfCNPgkMjNTQ== X-Received: by 2002:a05:6a20:4322:b0:10c:a627:7ede with SMTP id h34-20020a056a20432200b0010ca6277edemr207135pzk.58.1685067152650; Thu, 25 May 2023 19:12:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com Subject: [PATCH v2 3/4] decodetree: Diagnose empty pattern group Date: Thu, 25 May 2023 19:12:27 -0700 Message-Id: <20230526021228.1777917-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230526021228.1777917-1-richard.henderson@linaro.org> References: <20230526021228.1777917-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::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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: 1685067187629100001 Content-Type: text/plain; charset="utf-8" Test err_pattern_group_empty.decode failed with exception: Traceback (most recent call last): File "./scripts/decodetree.py", line 1424, in main() File "./scripts/decodetree.py", line 1342, in main toppat.build_tree() File "./scripts/decodetree.py", line 627, in build_tree self.tree =3D self.__build_tree(self.pats, self.fixedbits, File "./scripts/decodetree.py", line 607, in __build_tree fb =3D i.fixedbits & innermask TypeError: unsupported operand type(s) for &: 'NoneType' and 'int' Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/decodetree.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index e2640cc79b..e4ef0a03cc 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -506,6 +506,12 @@ def output_code(self, i, extracted, outerbits, outerma= sk): output(ind, '}\n') else: p.output_code(i, extracted, p.fixedbits, p.fixedmask) + + def build_tree(self): + if not self.pats: + error_with_file(self.file, self.lineno, 'empty pattern group') + super().build_tree() + #end IncMultiPattern =20 =20 --=20 2.34.1 From nobody Fri Mar 29 05:09:28 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=1685067218; cv=none; d=zohomail.com; s=zohoarc; b=gmDYqWB/q6j9iUTgXwO/61jAj7PNQQ4flQ4mD/+w/vrIEQdH20cOWoYbje6HgayCnZ0ENLac7aV1oaaMeWg1RMgv0ZMq03O+pElwwuV7pPfRP1DysM48YlCPaqhueAF9v/vAN83I4gIvJY6BLPfDLvKD8Tt9UXwuSh2riK7WHAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685067218; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n2KZhBl7auKQZshK7fFmdKmLRAK3y6cufIORo1eqyzc=; b=Ncw0srZhuarDQRauTg5kd9/dCecQ7tEz9RdzuoExEPoYnILUdUKnlH8v+El8vtMvSMgIU0JVYr3LbwGiH070UdzlG/9gK8tPeppNl98RfeV34a2FBL6Au7A3T8ek+5BaCAKbORhowok32inVcHK17Shicg3C6cmv1OngT6WBsE0= 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 1685067218814137.6974506166789; Thu, 25 May 2023 19:13:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Mwo-00029r-L5; Thu, 25 May 2023 22:12:54 -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 1q2Mwj-00028G-Ju for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:49 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2MwU-0004sz-Rt for qemu-devel@nongnu.org; Thu, 25 May 2023 22:12:49 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-253520adb30so289759a91.1 for ; Thu, 25 May 2023 19:12:34 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:7ac5:31cc:3997:3a16]) by smtp.gmail.com with ESMTPSA id oe17-20020a17090b395100b0023a9564763bsm3594086pjb.29.2023.05.25.19.12.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685067153; x=1687659153; 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=n2KZhBl7auKQZshK7fFmdKmLRAK3y6cufIORo1eqyzc=; b=sUzfwKv6CRwwQeoxGMUrjM4Mel4UicrC69aqTKCrxD3RQlqx1FciBktxsYFJt6ntKD mBehDnIJ/zEYg5ABJ1A+vE55EYTyqDe03xr9kDnIXB2Z6B6kPJWLOEyj2p3R9DP2014y Quo5PByeFm3vrTE6mQ26CCAzxFL1KjA42hCFmSg5GPF3o+tmosAGBu9HzmMbQkjjDeh7 9uoqwitrJ/CVzCOqCMrkheeFcpcYZiPEnT1C5SEspB80s2RIZ9q/KgDtBs0u/681IBV0 qU+UA4u0Oq5W5UdKCzOZAsR+Ack10FjPuUIMy77F1+I+K+YC/6LKEvhtDXUOAUH8cjP0 Cgjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685067153; x=1687659153; 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=n2KZhBl7auKQZshK7fFmdKmLRAK3y6cufIORo1eqyzc=; b=RwvtJIvlAZb+ed9mTVavJpgP3itK0Jx7LVhZF0swOafSX3YMLp7piK4FM/w9Hhe6EY PpUgXeQZyiUE0U584nIKohOgXHAcErvM12/pan/dNidzgDU+pEzCWq2VADwxexxMxD9s SvbszMKVrdk9HBqU0/ve9SIrGYtI3eEZAz1HFLHX9jQc2ziNUjsry16W47AxuaUr7xFZ zTRPi3syB4rdhaBnIKLGy2sl2+xzeMHMm08CziKQelUieSWUWBnfzMqlL8qwUT5B13pe PcEAabKX1Q+1qsMioh4hWMSlI85J6UWQO6GKHzgLaOWcM+tgLFrVGkPmP6za/sH58E54 7Bsw== X-Gm-Message-State: AC+VfDzSS5WNuPiylFiEXgREKOhc6BMJbdAJZU99rpvMELs/Sacn3Kkt 8U2Yo5dGnp6FQCVtfac7NeXTQcIlZM3O5o908EA= X-Google-Smtp-Source: ACHHUZ7XyjVgsyixvIuRfM3SlVb6G6rK5OxuDsAEkH4Hzy+o2MZ6f8Nz0ZpDr9Yc/LKE6OiaHBUuIQ== X-Received: by 2002:a17:90a:17a2:b0:24e:e6c:794c with SMTP id q31-20020a17090a17a200b0024e0e6c794cmr644829pja.38.1685067153537; Thu, 25 May 2023 19:12:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com Subject: [PATCH v2 4/4] tests/decode: Convert tests to meson Date: Thu, 25 May 2023 19:12:28 -0700 Message-Id: <20230526021228.1777917-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230526021228.1777917-1-richard.henderson@linaro.org> References: <20230526021228.1777917-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::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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: 1685067219036100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/decode/check.sh | 24 ---------------- tests/decode/meson.build | 59 ++++++++++++++++++++++++++++++++++++++++ tests/meson.build | 5 +--- 3 files changed, 60 insertions(+), 28 deletions(-) delete mode 100755 tests/decode/check.sh create mode 100644 tests/decode/meson.build diff --git a/tests/decode/check.sh b/tests/decode/check.sh deleted file mode 100755 index 95445a0115..0000000000 --- a/tests/decode/check.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# This work is licensed under the terms of the GNU LGPL, version 2 or late= r. -# See the COPYING.LIB file in the top-level directory. - -PYTHON=3D$1 -DECODETREE=3D$2 -E=3D0 - -# All of these tests should produce errors -for i in err_*.decode; do - if $PYTHON $DECODETREE $i > /dev/null 2> /dev/null; then - # Pass, aka failed to fail. - echo FAIL: $i 1>&2 - E=3D1 - fi -done - -for i in succ_*.decode; do - if ! $PYTHON $DECODETREE $i > /dev/null 2> /dev/null; then - echo FAIL:$i 1>&2 - fi -done - -exit $E diff --git a/tests/decode/meson.build b/tests/decode/meson.build new file mode 100644 index 0000000000..b4850562f9 --- /dev/null +++ b/tests/decode/meson.build @@ -0,0 +1,59 @@ +err_tests =3D [ + 'err_argset1.decode', + 'err_argset2.decode', + 'err_field1.decode', + 'err_field2.decode', + 'err_field3.decode', + 'err_field4.decode', + 'err_field5.decode', + 'err_field6.decode', + 'err_init1.decode', + 'err_init2.decode', + 'err_init3.decode', + 'err_init4.decode', + 'err_overlap1.decode', + 'err_overlap2.decode', + 'err_overlap3.decode', + 'err_overlap4.decode', + 'err_overlap5.decode', + 'err_overlap6.decode', + 'err_overlap7.decode', + 'err_overlap8.decode', + 'err_overlap9.decode', + 'err_pattern_group_empty.decode', + 'err_pattern_group_ident1.decode', + 'err_pattern_group_ident2.decode', + 'err_pattern_group_nest1.decode', + 'err_pattern_group_nest2.decode', + 'err_pattern_group_nest3.decode', + 'err_pattern_group_overlap1.decode', + 'err_width1.decode', + 'err_width2.decode', + 'err_width3.decode', + 'err_width4.decode', +] + +succ_tests =3D [ + 'succ_argset_type1.decode', + 'succ_function.decode', + 'succ_ident1.decode', + 'succ_pattern_group_nest1.decode', + 'succ_pattern_group_nest2.decode', + 'succ_pattern_group_nest3.decode', + 'succ_pattern_group_nest4.decode', +] + +suite =3D 'decodetree' +decodetree =3D find_program(meson.project_source_root() / 'scripts/decodet= ree.py') + +foreach t: err_tests + test(fs.replace_suffix(t, ''), + decodetree, args: ['-o', '/dev/null', '--test-for-error', files(t= )], + suite: suite) +endforeach + +foreach t: succ_tests + test(fs.replace_suffix(t, ''), + decodetree, args: ['-o', '/dev/null', files(t)], + suite: suite) +endforeach diff --git a/tests/meson.build b/tests/meson.build index 8e318ec513..083f2990bd 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -74,10 +74,7 @@ if have_tools and have_vhost_user and 'CONFIG_LINUX' in = config_host dependencies: [qemuutil, vhost_user]) endif =20 -test('decodetree', sh, - args: [ files('decode/check.sh'), config_host['PYTHON'], files('../sc= ripts/decodetree.py') ], - workdir: meson.current_source_dir() / 'decode', - suite: 'decodetree') +subdir('decode') =20 if 'CONFIG_TCG' in config_all subdir('fp') --=20 2.34.1