From bf62e5b49cd2158ea2552bc4fb4f713b1baa1b78 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 13 Mar 2001 00:51:40 +0000 Subject: [PATCH] * gnu-nat.c: Include "gdb_assert.h" instead of . (proc_update_sc): Use gdb_assert instead of assert. (proc_abort): Ditto. (inf_set_step_thread): Ditto. (gnu_wait): Ditto. (S_exception_raise_request): Ditto. (gnu_terminal_init_inferior): Ditto. --- gdb/ChangeLog | 10 ++++++++++ gdb/gnu-nat.c | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f5fe415..974cc21 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2001-03-12 Andrew Cagney + + * gnu-nat.c: Include "gdb_assert.h" instead of . + (proc_update_sc): Use gdb_assert instead of assert. + (proc_abort): Ditto. + (inf_set_step_thread): Ditto. + (gnu_wait): Ditto. + (S_exception_raise_request): Ditto. + (gnu_terminal_init_inferior): Ditto. + 2001-03-09 Kevin Buettner * Makefile.in (solib-svr4.o): Depend on solib-svr4.c, not solib.c. diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index 5a2b58d..ae22844 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA. */ -#include #include #include #include @@ -61,6 +60,7 @@ #include "gdbcmd.h" #include "gdbcore.h" #include "gdbthread.h" +#include "gdb_assert.h" #include "gnu-nat.h" @@ -262,7 +262,7 @@ proc_update_sc (struct proc *proc) if (proc->sc == 0 && proc->state_changed) /* Since PROC may start running, we must write back any state changes. */ { - assert (proc_is_thread (proc)); + gdb_assert (proc_is_thread (proc)); proc_debug (proc, "storing back changed thread state"); err = thread_set_state (proc->port, THREAD_STATE_FLAVOR, (thread_state_t) &proc->state, THREAD_STATE_SIZE); @@ -318,7 +318,7 @@ proc_update_sc (struct proc *proc) void proc_abort (struct proc *proc, int force) { - assert (proc_is_thread (proc)); + gdb_assert (proc_is_thread (proc)); if (!proc->aborted) { @@ -1157,7 +1157,7 @@ inf_suspend (struct inf *inf) void inf_set_step_thread (struct inf *inf, struct proc *thread) { - assert (!thread || proc_is_thread (thread)); + gdb_assert (!thread || proc_is_thread (thread)); if (thread) inf_debug (inf, "setting step thread: %d/%d", inf->pid, thread->tid); @@ -1429,7 +1429,7 @@ gnu_wait (int tid, struct target_waitstatus *status) extern int notify_server (mach_msg_header_t *, mach_msg_header_t *); extern int process_reply_server (mach_msg_header_t *, mach_msg_header_t *); - assert (inf->task); + gdb_assert (inf->task); if (!inf->threads && !inf->pending_execs) /* No threads! Assume that maybe some outside agency is frobbing our @@ -1669,7 +1669,7 @@ S_exception_raise_request (mach_port_t port, mach_port_t reply_port, inf_debug (waiting_inf, "Handler is task exception port <%d>", inf->task->saved_exc_port); inf->wait.exc.handler = inf->task->saved_exc_port; - assert (inf->task->exc_port == port); + gdb_assert (inf->task->exc_port == port); } if (inf->wait.exc.handler != MACH_PORT_NULL) /* Add a reference to the exception handler. */ @@ -2195,7 +2195,7 @@ gnu_detach (char *args, int from_tty) static void gnu_terminal_init_inferior (void) { - assert (current_inferior); + gdb_assert (current_inferior); terminal_init_inferior_with_pgrp (current_inferior->pid); } -- 2.7.4