From patchwork Tue May 30 18:59:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 686893 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp893229wru; Tue, 30 May 2023 12:01:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6MGVDSqRa9YXgqwypxUNH3+Umm9jldWYK2iPDX6yyEir92RwyIDsf07UDb7RPJTFZCeIoB X-Received: by 2002:ac8:4e8d:0:b0:3f6:bffe:3c04 with SMTP id 13-20020ac84e8d000000b003f6bffe3c04mr3240461qtp.66.1685473311229; Tue, 30 May 2023 12:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685473311; cv=none; d=google.com; s=arc-20160816; b=Tvn8vZbNADg+tT1Idco/3hEZcqEUEbXgMfDWSky8Yu04af11oN0TKSxXPrTjAZuFjo MfOVw9jDLY0tlLqqDNXVxqewz+zXESvtf7BcCXuP1XeqXJ44PvBmlkRUlbcUIv81A3DB JA3E7OCqPOfuOwlxDq5QnXve0HrtRc8DLYux9hNS3AgCbG66nSq5FbLWKpTRuT2gLxGl AVZGcwfzvNtUvxiXVH0+rl1gYiy0lkUDKn5gBWenqZ1S64lpLSA++2VERI/a2bWuh/yD kjQlBYxtRkOPtTbLZS3tHyeFyQF8Rw26pc+/3rXidCTFNLu48GuXywDG0G/1Vm+0bTel OqZQ== 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=lFF1s6+sMccjm/JJjgUTIY2lXRrgEsfEba9Cc0AjjNI=; b=WpJGuBkVFRp6m6m1l3zQa50tb/HjEtgdf1I9RMCu2XSEUdmlJhPV3CQK7ucvhukRqP YnUXon8IkBG9MokCx6WSmCylY/YdpDRZoBScVY9iRMthnBGwGjmxVOUFDWtAOK/dRvl9 bSu/F8Q9r8RTpPZAcOWkmbsJ7nofAOZslVNTrNPi7N10Kwncg6HpGH3VO+b2i9ZFwawG M+0hMpSd6VWwOFPdOzXrWWn3F8Yu6zLvk3dLnCJ7UxidUSJB52y7WBKrMzfYepQjlyfk QdnnTbhZBBxiLfhhp1AFHSfx29upUaMh24ZQFWvZHNWcsSnIzbxtiC+zG+CBupKr5nZ3 E/lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C5ENRkks; 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 o18-20020a05622a139200b003f542924cb9si6634440qtk.378.2023.05.30.12.01.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 May 2023 12:01:51 -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=C5ENRkks; 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 1q44a9-0000w3-T8; Tue, 30 May 2023 15:00:35 -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 1q44Zm-0000qF-5s for qemu-devel@nongnu.org; Tue, 30 May 2023 15:00:11 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q44Zk-0000sb-C5 for qemu-devel@nongnu.org; Tue, 30 May 2023 15:00:09 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64fd7723836so2037869b3a.1 for ; Tue, 30 May 2023 12:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685473207; x=1688065207; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lFF1s6+sMccjm/JJjgUTIY2lXRrgEsfEba9Cc0AjjNI=; b=C5ENRkksEZo/Ch6cZBaIspjr5OBFW9Z5aJVKTXCafRGOt7DUwSp8TrY8xBvnvSFIXE uwGY+ZC3YGprilcp4IH70u07v5tir8A53hdyYqdtgYc8o5JW7u2DDevpgsES6nTm5CPY o0EdRX6ef39zKTREKeYFwpEt38NCK+BfnHQfXd2aqA42iE8umDcX+8wHDl0eGbd+Yfco GZb4peRmc6h6TNX2BwkFA1G0LSnpAolz63BlA9BJolM7IDyX+Av5mrSNpD4xun/XnF2v EJc/4hIQuDeFXs/gPyExayhY09hUGdYnHBi5imGc3VhV0V9DHhoS6n+LOnlJTsWG0zam STsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685473207; x=1688065207; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lFF1s6+sMccjm/JJjgUTIY2lXRrgEsfEba9Cc0AjjNI=; b=aTcpzwPYaxYJQ5GQgY7L0mQ4fc0X6Ua8Gm+moaIRSVz95lQ/tgzt7T+fxXdsxtbXbE luCFquFv4KQEvbYdVNu7renZlGxmFZSCU0VVrFlilFg0Pg2OGkEBrlWYI145ORfK1apN 9P22DWYi54YDoBrOuxuCU3kNuK5JSMHSt2Gm03zCUF3stdPVAleV3rgoBQvDs9/VdBIO WxMDmLagLHQ8Xuv3LmWj0czbqmzrGWRTEDGYuXrwwJTPtDuXAMScNElJ9kLjDumR9Q8c vCdyPvt8kTENTCFzjevFQpBuEw0xMXGHoMFqL4mTBDcp3uJmkCXWipSdMY7W4Pl1llNK Y5Hg== X-Gm-Message-State: AC+VfDziPDro155cbNHzU6UJUxl0i0EZb2DLFX6ekbsCxvztjfi1uPUP YY315VnZ9QOYBcxegR6+BWurZc7DeR7j2pSmNyQ= X-Received: by 2002:a05:6a20:3947:b0:10c:41a6:ac1b with SMTP id r7-20020a056a20394700b0010c41a6ac1bmr4045556pzg.38.1685473207417; Tue, 30 May 2023 12:00:07 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:35a2:c45d:7485:f488]) by smtp.gmail.com with ESMTPSA id g18-20020a63fa52000000b0051f14839bf3sm9128496pgk.34.2023.05.30.12.00.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 12:00:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 19/27] decodetree: Fix recursion in prop_format and build_tree Date: Tue, 30 May 2023 11:59:41 -0700 Message-Id: <20230530185949.410208-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230530185949.410208-1-richard.henderson@linaro.org> References: <20230530185949.410208-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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 Two copy-paste errors walking the parse tree. Signed-off-by: Richard Henderson --- 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): def prop_format(self): for p in self.pats: - p.build_tree() + p.prop_format() def prop_width(self): width = None @@ -624,7 +624,7 @@ def __build_tree(pats, outerbits, outermask): return t def build_tree(self): - super().prop_format() + super().build_tree() self.tree = self.__build_tree(self.pats, self.fixedbits, self.fixedmask)