From patchwork Mon Nov 27 20:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 80843 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 CCE2F384DECB for ; Mon, 27 Nov 2023 20:21:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 730BD3858425 for ; Mon, 27 Nov 2023 20:20:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 730BD3858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 730BD3858425 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701116460; cv=none; b=AKq10ZwIMjdoWx8VjVOqwRg387UhZ8ufuhhiYuT7VgX6zvQEvzzS//t7eO1ZE2AyIMK+oAswZIFtFR8UeIF2Mox7bZPzYknfhqVEWP+0hGWHjYlCSxg5IPgIZ2FGVC5Rs77Ecg3CO1CpepMFj9e6/m/yUfQaQ/SL8p5kP/Ezxbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701116460; c=relaxed/simple; bh=6QDcN5EwjhIz7tWPgcnQ0tTbDy55ocrf3AROxjhx4gM=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=bOVoKypXoBynhDQnT8cztwZLXU1w4pjyMGeg6E01itzsMTGpJsPJV4YxHaxWytnfPAjsgPQbI08rSbEtJW8HN5KR/uxHQOunq6zcFHLGrthUX+Xf7MuzGfQTAV816JBtZ9PbtZctyCavQs2pS0roQPr1ecy8MzmjMHKxdIPjjgU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9199721B6F for ; Mon, 27 Nov 2023 20:20:57 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7AC5413ABA for ; Mon, 27 Nov 2023 20:20:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4JCVHCn6ZGW7HwAAD6G6ig (envelope-from ) for ; Mon, 27 Nov 2023 20:20:57 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/3] [gdb/tdep] Add gdbarch_extended_event_to_syscall Date: Mon, 27 Nov 2023 21:20:53 +0100 Message-Id: <20231127202054.22070-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231127202054.22070-1-tdevries@suse.de> References: <20231127202054.22070-1-tdevries@suse.de> MIME-Version: 1.0 X-Spamd-Bar: ++++++++++++ Authentication-Results: smtp-out1.suse.de; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=suse.de (policy=none); spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:97 is neither permitted nor denied by domain of tdevries@suse.de) smtp.mailfrom=tdevries@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [12.28 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(4.60)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(2.20)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_SPAM_LONG(3.49)[0.998]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[suse.de : No valid SPF, No valid DKIM,none] X-Spam-Score: 12.28 X-Rspamd-Queue-Id: 9199721B6F X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 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 Add a new gdbarch hook, that translates ptrace events like PTRACE_EVENT_EXEC into the system call number that triggers the event. No implementation and no use of the hook yet, this will be added in the following patch. --- gdb/arch-utils.c | 8 ++++++++ gdb/arch-utils.h | 3 +++ gdb/gdbarch-gen.h | 7 +++++++ gdb/gdbarch.c | 22 ++++++++++++++++++++++ gdb/gdbarch_components.py | 12 ++++++++++++ 5 files changed, 52 insertions(+) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index c64584c5760..27ed580b265 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1492,6 +1492,14 @@ gdbarch_initialized_p (gdbarch *arch) return arch->initialized_p; } +/* See arch-utils.h. */ + +int +default_extended_event_to_syscall (struct gdbarch *, int) +{ + return -1; +} + void _initialize_gdbarch_utils (); void _initialize_gdbarch_utils () diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index e53950c4408..e41d31321a5 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -325,4 +325,7 @@ extern enum return_value_convention default_gdbarch_return_value struct regcache *regcache, struct value **read_value, const gdb_byte *writebuf); +/* Default implementation of gdbarch extended_event_to_syscall method. */ +extern int default_extended_event_to_syscall (struct gdbarch *, int); + #endif /* ARCH_UTILS_H */ diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h index 9f468bd1f61..62ad52f5da8 100644 --- a/gdb/gdbarch-gen.h +++ b/gdb/gdbarch-gen.h @@ -1283,6 +1283,13 @@ typedef LONGEST (gdbarch_get_syscall_number_ftype) (struct gdbarch *gdbarch, thr extern LONGEST gdbarch_get_syscall_number (struct gdbarch *gdbarch, thread_info *thread); extern void set_gdbarch_get_syscall_number (struct gdbarch *gdbarch, gdbarch_get_syscall_number_ftype *get_syscall_number); +/* Function for the 'catch syscall' feature. + Translate extended wait event to architecture-specific system call number. */ + +typedef int (gdbarch_extended_event_to_syscall_ftype) (struct gdbarch *gdbarch, int event); +extern int gdbarch_extended_event_to_syscall (struct gdbarch *gdbarch, int event); +extern void set_gdbarch_extended_event_to_syscall (struct gdbarch *gdbarch, gdbarch_extended_event_to_syscall_ftype *extended_event_to_syscall); + /* The filename of the XML syscall for this architecture. */ extern const char * gdbarch_xml_syscall_file (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index ea6e4c647b1..f4661b8b4cd 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -207,6 +207,7 @@ struct gdbarch gdbarch_get_siginfo_type_ftype *get_siginfo_type = nullptr; gdbarch_record_special_symbol_ftype *record_special_symbol = nullptr; gdbarch_get_syscall_number_ftype *get_syscall_number = nullptr; + gdbarch_extended_event_to_syscall_ftype *extended_event_to_syscall = default_extended_event_to_syscall; const char * xml_syscall_file = 0; struct syscalls_info * syscalls_info = 0; const char *const * stap_integer_prefixes = 0; @@ -475,6 +476,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of get_siginfo_type, has predicate. */ /* Skip verify of record_special_symbol, has predicate. */ /* Skip verify of get_syscall_number, has predicate. */ + /* Skip verify of extended_event_to_syscall, invalid_p == 0 */ /* Skip verify of xml_syscall_file, invalid_p == 0 */ /* Skip verify of syscalls_info, invalid_p == 0 */ /* Skip verify of stap_integer_prefixes, invalid_p == 0 */ @@ -1198,6 +1200,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) gdb_printf (file, "gdbarch_dump: get_syscall_number = <%s>\n", host_address_to_string (gdbarch->get_syscall_number)); + gdb_printf (file, + "gdbarch_dump: extended_event_to_syscall = <%s>\n", + host_address_to_string (gdbarch->extended_event_to_syscall)); gdb_printf (file, "gdbarch_dump: xml_syscall_file = %s\n", pstring (gdbarch->xml_syscall_file)); @@ -4512,6 +4517,23 @@ set_gdbarch_get_syscall_number (struct gdbarch *gdbarch, gdbarch->get_syscall_number = get_syscall_number; } +int +gdbarch_extended_event_to_syscall (struct gdbarch *gdbarch, int event) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->extended_event_to_syscall != NULL); + if (gdbarch_debug >= 2) + gdb_printf (gdb_stdlog, "gdbarch_extended_event_to_syscall called\n"); + return gdbarch->extended_event_to_syscall (gdbarch, event); +} + +void +set_gdbarch_extended_event_to_syscall (struct gdbarch *gdbarch, + gdbarch_extended_event_to_syscall_ftype extended_event_to_syscall) +{ + gdbarch->extended_event_to_syscall = extended_event_to_syscall; +} + const char * gdbarch_xml_syscall_file (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py index 694ac366023..0292c91d29f 100644 --- a/gdb/gdbarch_components.py +++ b/gdb/gdbarch_components.py @@ -2064,6 +2064,18 @@ Get architecture-specific system calls information from registers. predicate=True, ) +Method( + comment=""" +Function for the 'catch syscall' feature. +Translate extended wait event to architecture-specific system call number. +""", + type="int", + name="extended_event_to_syscall", + params=[("int", "event")], + predefault="default_extended_event_to_syscall", + invalid=False, +) + Value( comment=""" The filename of the XML syscall for this architecture.