From patchwork Mon Oct 17 16:59:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 58950 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 CEE263857C4B for ; Mon, 17 Oct 2022 16:59:36 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by sourceware.org (Postfix) with ESMTPS id A149E385829F for ; Mon, 17 Oct 2022 16:59:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A149E385829F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f45.google.com with SMTP id az22-20020a05600c601600b003c6b72797fdso10431351wmb.5 for ; Mon, 17 Oct 2022 09:59:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=A51JXLiongIFLSzVX7wvnL4Rk6dipa018XshyAIQPFM=; b=7JfDMe/ywsZmWEh/L+eID2nMw9T+/Ur0WaSo2ojS1xeoPNg6x5CrX9At2yFZ+Cd551 c29sQovKmQv2qp/wuVpB7IIDWDEvg04DjjQtwMsw1sSYjj+p/v4stX+YJrY1KcbqdBe0 I60GLDzjUENecPn9mdZWTGQqZrJ/hWUbgF4rzlY5kcsvzn63K8Fr7o/hlVjeoN9kC6/U oKXE3yFZ5XYXaCd1fSG0w6zKB7aH2Jk2DSyTXS5EPQOQP6aS7Iji3F/+Rx/qT5t6cH8G Ta9id/uJDZsDRkaq4hIejLTy1V7sM2udJdL0vFQknoMF7g3p53TrDxSrgbfh9Xfi6uy1 00BQ== X-Gm-Message-State: ACrzQf0Yef5WfIKg7eLwpQGZ7PKhL0raQhlGusb9WJY23llZmPOXn4rw vjXDxV+wZoK8X5EPj2dDNhRIzH4xGDc6QA== X-Google-Smtp-Source: AMsMyM55fxrBHVpHEfR2fnUS+YQiDCEvWgQbQeFSUsmbt7exLn+f9rweDxoROaZ1jvqu3yGeohEVhg== X-Received: by 2002:a05:600c:4f54:b0:3c6:edec:2787 with SMTP id m20-20020a05600c4f5400b003c6edec2787mr8298513wmq.109.1666025956008; Mon, 17 Oct 2022 09:59:16 -0700 (PDT) Received: from localhost ([2001:8a0:f93a:3b00:e038:5cdc:b8bf:4653]) by smtp.gmail.com with ESMTPSA id q19-20020a05600c2ed300b003b3365b38f9sm10489361wmn.10.2022.10.17.09.59.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Oct 2022 09:59:14 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [ob/pushed] gdbarch-components.py: Remove spurious space from "frame_info_ptr " params Date: Mon, 17 Oct 2022 17:59:13 +0100 Message-Id: <20221017165913.3107749-1-pedro@palves.net> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" If you run gdbarch.py today, you'll get local modifications compared to what's in the tree, like: --- c/gdb/gdbarch-gen.h +++ w/gdb/gdbarch-gen.h @@ -315,8 +315,8 @@ extern void set_gdbarch_register_type (struct gdbarch *gdbarch, gdbarch_register should match the address at which the breakpoint was set in the dummy frame. */ -typedef struct frame_id (gdbarch_dummy_id_ftype) (struct gdbarch *gdbarch, frame_info_ptr this_frame); -extern struct frame_id gdbarch_dummy_id (struct gdbarch *gdbarch, frame_info_ptr this_frame); +typedef struct frame_id (gdbarch_dummy_id_ftype) (struct gdbarch *gdbarch, frame_info_ptr this_frame); +extern struct frame_id gdbarch_dummy_id (struct gdbarch *gdbarch, frame_info_ptr this_frame); extern void set_gdbarch_dummy_id (struct gdbarch *gdbarch, gdbarch_dummy_id_ftype *dummy_id); etc. The extra space comes from the "frame_info_ptr " param that appears in a number of gdbarch methods in gdbarch-components.py. With the extra space removed, running ./gdbarch.py generates the exact code that's in the tree already. Change-Id: If7d20b8c6b2fd9ff466142a01bd2611c9ef9f53e --- gdb/gdbarch-components.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) base-commit: dd05fc7071a6517de13975fcddca861547351266 diff --git a/gdb/gdbarch-components.py b/gdb/gdbarch-components.py index ba16f4a6a1a..46e7565f293 100644 --- a/gdb/gdbarch-components.py +++ b/gdb/gdbarch-components.py @@ -613,7 +613,7 @@ frame. """, type="struct frame_id", name="dummy_id", - params=[("frame_info_ptr ", "this_frame")], + params=[("frame_info_ptr", "this_frame")], predefault="default_dummy_id", invalid=False, ) @@ -676,7 +676,7 @@ Return true if the code of FRAME is writable. """, type="int", name="code_of_frame_writable", - params=[("frame_info_ptr ", "frame")], + params=[("frame_info_ptr", "frame")], predefault="default_code_of_frame_writable", invalid=False, ) @@ -686,7 +686,7 @@ Method( name="print_registers_info", params=[ ("struct ui_file *", "file"), - ("frame_info_ptr ", "frame"), + ("frame_info_ptr", "frame"), ("int", "regnum"), ("int", "all"), ], @@ -699,7 +699,7 @@ Method( name="print_float_info", params=[ ("struct ui_file *", "file"), - ("frame_info_ptr ", "frame"), + ("frame_info_ptr", "frame"), ("const char *", "args"), ], predefault="default_print_float_info", @@ -711,7 +711,7 @@ Method( name="print_vector_info", params=[ ("struct ui_file *", "file"), - ("frame_info_ptr ", "frame"), + ("frame_info_ptr", "frame"), ("const char *", "args"), ], predicate=True, @@ -755,7 +755,7 @@ FRAME corresponds to the longjmp frame. """, type="int", name="get_longjmp_target", - params=[("frame_info_ptr ", "frame"), ("CORE_ADDR *", "pc")], + params=[("frame_info_ptr", "frame"), ("CORE_ADDR *", "pc")], predicate=True, invalid=True, ) @@ -778,7 +778,7 @@ Function( type="int", name="register_to_value", params=[ - ("frame_info_ptr ", "frame"), + ("frame_info_ptr", "frame"), ("int", "regnum"), ("struct type *", "type"), ("gdb_byte *", "buf"), @@ -792,7 +792,7 @@ Function( type="void", name="value_to_register", params=[ - ("frame_info_ptr ", "frame"), + ("frame_info_ptr", "frame"), ("int", "regnum"), ("struct type *", "type"), ("const gdb_byte *", "buf"), @@ -1065,7 +1065,7 @@ Value( Method( type="CORE_ADDR", name="unwind_pc", - params=[("frame_info_ptr ", "next_frame")], + params=[("frame_info_ptr", "next_frame")], predefault="default_unwind_pc", invalid=False, ) @@ -1073,7 +1073,7 @@ Method( Method( type="CORE_ADDR", name="unwind_sp", - params=[("frame_info_ptr ", "next_frame")], + params=[("frame_info_ptr", "next_frame")], predefault="default_unwind_sp", invalid=False, ) @@ -1085,7 +1085,7 @@ frame-base. Enable frame-base before frame-unwind. """, type="int", name="frame_num_args", - params=[("frame_info_ptr ", "frame")], + params=[("frame_info_ptr", "frame")], predicate=True, invalid=True, ) @@ -1260,7 +1260,7 @@ further single-step is needed before the instruction finishes. """, type="int", name="single_step_through_delay", - params=[("frame_info_ptr ", "frame")], + params=[("frame_info_ptr", "frame")], predicate=True, invalid=True, ) @@ -1280,7 +1280,7 @@ disassembler. Perhaps objdump can handle it? Function( type="CORE_ADDR", name="skip_trampoline_code", - params=[("frame_info_ptr ", "frame"), ("CORE_ADDR", "pc")], + params=[("frame_info_ptr", "frame"), ("CORE_ADDR", "pc")], predefault="generic_skip_trampoline_code", invalid=False, ) @@ -1503,7 +1503,7 @@ Fetch the pointer to the ith function argument. type="CORE_ADDR", name="fetch_pointer_argument", params=[ - ("frame_info_ptr ", "frame"), + ("frame_info_ptr", "frame"), ("int", "argi"), ("struct type *", "type"), ], @@ -2664,7 +2664,7 @@ Return a string containing any flags for the given PC in the given FRAME. """, type="std::string", name="get_pc_address_flags", - params=[("frame_info_ptr ", "frame"), ("CORE_ADDR", "pc")], + params=[("frame_info_ptr", "frame"), ("CORE_ADDR", "pc")], predefault="default_get_pc_address_flags", invalid=False, )