From patchwork Mon Nov 27 15:48:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 80828 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 E85CC385734F for ; Mon, 27 Nov 2023 15:49:04 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 20A903858C35 for ; Mon, 27 Nov 2023 15:48:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 20A903858C35 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 20A903858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701100132; cv=none; b=m9+9+SSWyA0qH8tyG3R+8r1L2gfoC9oRiPkvsLOM78hkmzisf74sgJSwE4SfwHde59HMs/DVE4E+qn1/fkhZ77XjHvTR2En4v5mn3B2AfajN8u0doQt39ESa+wtLyiyrHWN9JHNJ03kCW0bsHLJqD+ExbtI4uxxeSWOzBEYmh0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701100132; c=relaxed/simple; bh=gwsbVZ1A6Z/2OcKSR6ojdUEbxnztFlymARhBQAviwFY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=pIbX8x6zpHLB9MTG1RBghsbSQrLYZrACLmE0crpe91W/eWkDUKx9ACTYy47pyERRAsg/zrM5H6Hy1VcbWk1qezftLQ7E1tJMexcVfAvT2DATNZnFelipyIv6bBSzNpdMwAS+Q98s5Zj4/6+Kbi/HqLhbpdHUGJRH4nUVlcDJJpI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 2F2731E091; Mon, 27 Nov 2023 10:48:47 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] gdb: make catch_syscall_enabled return bool Date: Mon, 27 Nov 2023 10:48:44 -0500 Message-ID: <20231127154847.12655-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3496.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, 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 Make it return a bool and adjust a few comparisons where it's used. Change-Id: Ic77d23b0dcfcfc9195dfe65e4c7ff9cf3229f6fb --- gdb/break-catch-syscall.c | 6 ++++-- gdb/breakpoint.h | 5 ++--- gdb/i386-linux-nat.c | 2 +- gdb/inf-ptrace.c | 2 +- gdb/infrun.c | 2 +- gdb/netbsd-nat.c | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) base-commit: 935dc9ff652ca256c10672412c1df3da95cadbfb diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index a00ecebebbd8..bc0d5ca0eb3c 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -465,8 +465,10 @@ is_syscall_catchpoint_enabled (struct breakpoint *bp) return 0; } -int -catch_syscall_enabled (void) +/* See breakpoint.h. */ + +bool +catch_syscall_enabled () { struct catch_syscall_inferior_data *inf_data = get_catch_syscall_inferior_data (current_inferior ()); diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index e75efc90495b..feb798224c0a 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1868,9 +1868,8 @@ extern void set_breakpoint_condition (struct breakpoint *b, const char *exp, extern void set_breakpoint_condition (int bpnum, const char *exp, int from_tty, bool force); -/* Checks if we are catching syscalls or not. - Returns 0 if not, greater than 0 if we are. */ -extern int catch_syscall_enabled (void); +/* Checks if we are catching syscalls or not. */ +extern bool catch_syscall_enabled (); /* Checks if we are catching syscalls with the specific syscall_number. Used for "filtering" the catchpoints. diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 7e0572e19070..43a0a8a58a38 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -652,7 +652,7 @@ i386_linux_nat_target::low_resume (ptid_t ptid, int step, enum gdb_signal signal int pid = ptid.lwp (); int request; - if (catch_syscall_enabled () > 0) + if (catch_syscall_enabled ()) request = PTRACE_SYSCALL; else request = PTRACE_CONT; diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index ececf0e94986..407bffb74d68 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -262,7 +262,7 @@ inf_ptrace_target::resume (ptid_t ptid, int step, enum gdb_signal signal) single-threaded processes, so simply resume the inferior. */ ptid = ptid_t (inferior_ptid.pid ()); - if (catch_syscall_enabled () > 0) + if (catch_syscall_enabled ()) request = PT_SYSCALL; else request = PT_CONTINUE; diff --git a/gdb/infrun.c b/gdb/infrun.c index a1543ab2443c..cc6b2033eaf9 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -5080,7 +5080,7 @@ handle_syscall_event (struct execution_control_state *ecs) syscall_number = ecs->ws.syscall_number (); ecs->event_thread->set_stop_pc (regcache_read_pc (regcache)); - if (catch_syscall_enabled () > 0 + if (catch_syscall_enabled () && catching_syscall_number (syscall_number)) { infrun_debug_printf ("syscall number=%d", syscall_number); diff --git a/gdb/netbsd-nat.c b/gdb/netbsd-nat.c index 0cfcb45038cc..7ef200b8936c 100644 --- a/gdb/netbsd-nat.c +++ b/gdb/netbsd-nat.c @@ -509,7 +509,7 @@ nbsd_resume(nbsd_nat_target *target, ptid_t ptid, int step, perror_with_name (("ptrace")); } - if (catch_syscall_enabled () > 0) + if (catch_syscall_enabled ()) request = PT_SYSCALL; else request = PT_CONTINUE;