From nobody Fri Nov 14 19:24:25 2025 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=1589820202; cv=none; d=zohomail.com; s=zohoarc; b=b/j73RZyC8JuPCRS6ONoYveiKdnenm8xwWyFyD/aGg/eEZ2uZ3i65uffK/gFGwnAxD8ZRIpzSodKpDR6Nt4h/SwYCukBToBW6x/6safbQVkA/O5ZYpEODD4sY8PbZqHz4+06mEAbwiUmVg+HDFpTxCEOXOumEIkCIQ6uNwjj3fQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589820202; 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=mRcK8czV/oom/pkIx79cPTpR+Nhj4Hg+rOsk6vM94j4=; b=Z65eWVkcaWTWl0/01/2yuWcsQ5NZ5ZvfrQ8Jy43c5r9E5nb6apNnkXWzRqLZ9rGASFjw5CqVZcxkiHaax5thWuQjshL78M0mx59gO9bdFSySCicRQmwnUNkMHCzfj/+uBpe5Qe1mcV5WpxEuw6v8j2jONWS9/YpVFjs/5toXZdQ= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589820202642756.8358041774383; Mon, 18 May 2020 09:43:22 -0700 (PDT) Received: from localhost ([::1]:55032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jairJ-0006I7-9o for importer@patchew.org; Mon, 18 May 2020 12:43:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaip3-000212-CR for qemu-devel@nongnu.org; Mon, 18 May 2020 12:41:01 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:34692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaip2-0005pw-GJ for qemu-devel@nongnu.org; Mon, 18 May 2020 12:41:01 -0400 Received: by mail-pl1-x62b.google.com with SMTP id g11so4453983plp.1 for ; Mon, 18 May 2020 09:41:00 -0700 (PDT) Received: from localhost.localdomain (174-21-143-238.tukw.qwest.net. [174.21.143.238]) by smtp.gmail.com with ESMTPSA id x132sm5790610pfd.214.2020.05.18.09.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 09:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mRcK8czV/oom/pkIx79cPTpR+Nhj4Hg+rOsk6vM94j4=; b=cNbsIj9eglGL5hwv9PKqKn/U1sEOD3nRLjBRyV0j8hserxzrN3sLVX3BM3R+jJRLX3 eVCpcWHep/pXovhC84H+1dLpsjkChFKlXNUuBLpqMzidhMXrXC24XX65QDSQqQkx4yE7 VJdPUkUjFR1AMzYVd1DJCBCU3+hhH1heQTZ443oFqQVNuZ57aHon2+nTIL3VVuYL+kI1 ETVQpuV/EgNFIbDzwM1V/30RV/53hlAQ1xH4Cl9csYFt/b+/K2jDXP1WRNmOLImkYur/ OT9oKQ3fiolNVgQ7iSB4+ODMBi2UVOYX5esqWjZmkgxEIBLAJld9QUqE5xCK+Zi3o8kn u2lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mRcK8czV/oom/pkIx79cPTpR+Nhj4Hg+rOsk6vM94j4=; b=rpRpBqtv5Y6JWPF6pvMeDfKz7VpHOhQ3FdKVcYFFQJtDnyJ9DMNd7r+vO1jd1hX/fx 92XRpEp07+083JpawjgkesFqrN1ahcBKe+DmFzfJgCvAxyHkKIvSI1GAOhAyDJ0purIY 6DmLB5Vkv9x1FKAcd7FCNsDbsXL5XXMNN6h5kbQeElgtPxrn4pNwrQNw1xSMPOJe1OTo 6yU/Zj31STWKW0Cj4HD+xSZHLPfSc7PBOZzLwZ1Ovh4s/PBu4eGJsaU1ZTYLVtd0/c8f ijxFMnjhR4dYhtziyihD6foWyiaQ0d3ueIi2VXABj1hQ+Y6pBqGKnMDsQaIHFBW4qu87 gQFw== X-Gm-Message-State: AOAM5319HVo2tIFgAb8sUsNSsv2P0ozTZZjc5R0WJ9p5+VxukyFjYWOG HeyZyvfHhMVnK/faCQG5MIQZOYx/c+c= X-Google-Smtp-Source: ABdhPJyPHWxMOxYfyRF+BHa8WEmZOSrv9LDtSAXdNWqV971szryGbNrxyNZDGHeO8a0SM7liM+4AzQ== X-Received: by 2002:a17:90a:a402:: with SMTP id y2mr291192pjp.24.1589820058605; Mon, 18 May 2020 09:40:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/8] decodetree: Rename MultiPattern to IncMultiPattern Date: Mon, 18 May 2020 09:40:47 -0700 Message-Id: <20200518164052.18689-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200518164052.18689-1-richard.henderson@linaro.org> References: <20200518164052.18689-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::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Name the current node for "inclusive" multi-pattern, in preparation for adding a node for "exclusive" multi-pattern. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/decodetree.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index b559db3086..7af6b3056d 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -371,7 +371,7 @@ class Pattern(General): # end Pattern =20 =20 -class MultiPattern(General): +class IncMultiPattern(General): """Class representing an overlapping set of instruction patterns""" =20 def __init__(self, lineno, pats, fixb, fixm, udfm, w): @@ -410,7 +410,7 @@ class MultiPattern(General): output(ind, '}\n') else: p.output_code(i, extracted, p.fixedbits, p.fixedmask) -#end MultiPattern +#end IncMultiPattern =20 =20 def parse_field(lineno, name, toks): @@ -751,8 +751,8 @@ def parse_generic(lineno, is_format, name, toks): .format(allbits ^ insnmask)) # end parse_general =20 -def build_multi_pattern(lineno, pats): - """Validate the Patterns going into a MultiPattern.""" +def build_incmulti_pattern(lineno, pats): + """Validate the Patterns going into a IncMultiPattern.""" global patterns global insnmask =20 @@ -792,9 +792,9 @@ def build_multi_pattern(lineno, pats): else: repeat =3D False =20 - mp =3D MultiPattern(lineno, pats, fixedbits, fixedmask, undefmask, wid= th) + mp =3D IncMultiPattern(lineno, pats, fixedbits, fixedmask, undefmask, = width) patterns.append(mp) -# end build_multi_pattern +# end build_incmulti_pattern =20 def parse_file(f): """Parse all of the patterns within a file""" @@ -860,7 +860,7 @@ def parse_file(f): error(start_lineno, 'indentation ', indent, ' !=3D ', nest= ing) pats =3D patterns patterns =3D saved_pats.pop() - build_multi_pattern(lineno, pats) + build_incmulti_pattern(lineno, pats) toks =3D [] continue =20 --=20 2.20.1