From patchwork Mon Feb 27 01:14:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 65661 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 826FA3858D20 for ; Mon, 27 Feb 2023 01:16:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 826FA3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677460599; bh=ayqPlPozdcZaytjTlGZdUsO3V7fM1lqw0B33GcqDTek=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=TZRzpE6Nz7bVqdXt9s7npN5QQ9DUu8yp2mBoRrKVcKB2R2t1JvA2y2IizxhGZPykD PdWXydgyM9e7FGxyHUoGuGCaPwjQjj6OSoCBjZk85tE9leB9SH+SCqDcx52aaqEgQq udKr4EfeEPrapj84U8lvvkZWUVrWl4+2TFcyPctc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id DFD553858D20 for ; Mon, 27 Feb 2023 01:16:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFD553858D20 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 31R1G9sV026738 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 26 Feb 2023 20:16:13 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 31R1G9sV026738 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id D6AC21E221; Sun, 26 Feb 2023 20:16:08 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi , Tom Tromey Subject: [PATCH v3 09/10] gdb: make-target-delegates.py: add Entry type Date: Sun, 26 Feb 2023 20:14:02 -0500 Message-Id: <20230227011403.612304-10-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230227011403.612304-1-simon.marchi@polymtl.ca> References: <20230227011403.612304-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Mon, 27 Feb 2023 01:16:09 +0000 X-Spam-Status: No, score=-3189.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Add the Entry type and use it in the `entries` map, rather than using an ad-hoc str -> str map that comes from the re.match. This will make it easier to make typing work in a subsequent patch, but it also helps readers know what attributes exist for entries, which is not clear currently. Change-Id: I5b58dee1ed7ae85987b99bd417e641ede718624c Reviewed-By: Tom Tromey --- gdb/make-target-delegates.py | 55 +++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py index 2df84cd458c6..1e2e741bc320 100755 --- a/gdb/make-target-delegates.py +++ b/gdb/make-target-delegates.py @@ -21,8 +21,9 @@ # make-target-delegates.py import re -import gdbcopyright +from typing import List +import gdbcopyright # The line we search for in target.h that marks where we should start # looking for methods. @@ -92,6 +93,16 @@ ARGTYPES = re.compile( TARGET_DEBUG_PRINTER = r"\s*TARGET_DEBUG_PRINTER\s*\((?P[^)]*)\)\s*" +class Entry: + def __init__( + self, argtypes: List[str], return_type: str, style: str, default_arg: str + ): + self.argtypes = argtypes + self.return_type = return_type + self.style = style + self.default_arg = default_arg + + def scan_target_h(): found_trigger = False all_the_text = "" @@ -295,10 +306,9 @@ def print_class(f, class_name, delegators, entries): print("", file=f) for name in delegators: - return_type = entries[name]["return_type"] - argtypes = entries[name]["argtypes"] print(" ", file=f, end="") - write_declaration(f, name, return_type, argtypes) + entry = entries[name] + write_declaration(f, name, entry.return_type, entry.argtypes) print("};\n", file=f) @@ -313,11 +323,14 @@ for current_line in scan_target_h(): if not m: continue data = m.groupdict() - data["argtypes"] = parse_argtypes(data["args"]) - data["return_type"] = data["return_type"].strip() - entries[data["name"]] = data + name = data["name"] + argtypes = parse_argtypes(data["args"]) + return_type = data["return_type"].strip() + style = data["style"] + default_arg = data["default_arg"] + entries[name] = Entry(argtypes, return_type, style, default_arg) - delegators.append(data["name"]) + delegators.append(name) with open("target-delegates.c", "w") as f: print( @@ -330,11 +343,21 @@ with open("target-delegates.c", "w") as f: print_class(f, "debug_target", delegators, entries) for name in delegators: - tdefault = entries[name]["default_arg"] - return_type = entries[name]["return_type"] - style = entries[name]["style"] - argtypes = entries[name]["argtypes"] - - write_delegator(f, name, return_type, argtypes) - write_tdefault(f, tdefault, style, name, return_type, argtypes) - write_debugmethod(f, tdefault, name, return_type, argtypes) + entry = entries[name] + + write_delegator(f, name, entry.return_type, entry.argtypes) + write_tdefault( + f, + entry.default_arg, + entry.style, + name, + entry.return_type, + entry.argtypes, + ) + write_debugmethod( + f, + entry.default_arg, + name, + entry.return_type, + entry.argtypes, + )