diff options
| -rw-r--r-- | gdb/break-catch-syscall.c | 6 | ||||
| -rw-r--r-- | gdb/breakpoint.h | 5 | ||||
| -rw-r--r-- | gdb/i386-linux-nat.c | 2 | ||||
| -rw-r--r-- | gdb/inf-ptrace.c | 2 | ||||
| -rw-r--r-- | gdb/infrun.c | 2 | ||||
| -rw-r--r-- | gdb/netbsd-nat.c | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index a00eceb..bc0d5ca 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 e75efc9..feb7982 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 7e0572e..43a0a8a5 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 ececf0e..407bffb 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 a1543ab..cc6b203 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 0cfcb45..7ef200b 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; |