From ef57601be42a9737cc3bc67f6ddba457e7a5db07 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 25 Feb 2007 17:59:43 +0000 Subject: [PATCH] * target.h (target_ops): Rename send_signal to request_interrupt, and remove enum target_signal parameter. * linux-low.c (linux_request_interrupt): Rename from linux_send_signal, and always send SIGINT. * spu-low.c (spu_request_interrupt): Rename from spu_send_signal, and always send SIGINT. * remote-utils.c (putpkt_binary): Call request_interrupt, instead of send_signal. (input_interrupt): Likewise. --- gdb/gdbserver/ChangeLog | 12 ++++++++++++ gdb/gdbserver/linux-low.c | 8 ++++---- gdb/gdbserver/remote-utils.c | 6 +++--- gdb/gdbserver/spu-low.c | 6 +++--- gdb/gdbserver/target.h | 6 ++++-- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 82b9bfca176..d1265122fad 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,15 @@ +2007-02-25 Pedro Alves + + * target.h (target_ops): Rename send_signal to request_interrupt, + and remove enum target_signal parameter. + * linux-low.c (linux_request_interrupt): Rename from + linux_send_signal, and always send SIGINT. + * spu-low.c (spu_request_interrupt): Rename from spu_send_signal, + and always send SIGINT. + * remote-utils.c (putpkt_binary): Call request_interrupt, instead + of send_signal. + (input_interrupt): Likewise. + 2007-02-25 Pedro Alves * server.c (get_features_xml): Check if target implemented diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 1d495936305..55beebc7bb9 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -1514,7 +1514,7 @@ linux_look_up_symbols (void) } static void -linux_send_signal (int signum) +linux_request_interrupt (void) { extern unsigned long signal_pid; @@ -1523,10 +1523,10 @@ linux_send_signal (int signum) struct process_info *process; process = get_thread_process (current_inferior); - kill_lwp (process->lwpid, signum); + kill_lwp (process->lwpid, SIGINT); } else - kill_lwp (signal_pid, signum); + kill_lwp (signal_pid, SIGINT); } /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET @@ -1660,7 +1660,7 @@ static struct target_ops linux_target_ops = { linux_read_memory, linux_write_memory, linux_look_up_symbols, - linux_send_signal, + linux_request_interrupt, linux_read_auxv, linux_insert_watchpoint, linux_remove_watchpoint, diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 5a34c67e104..ffacb6e49d5 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -549,7 +549,7 @@ putpkt_binary (char *buf, int cnt) /* Check for an input interrupt while we're here. */ if (buf3[0] == '\003') - (*the_target->send_signal) (SIGINT); + (*the_target->request_interrupt) (); } while (buf3[0] != '+'); @@ -572,7 +572,7 @@ putpkt (char *buf) /* Come here when we get an input interrupt from the remote side. This interrupt should only be active while we are waiting for the child to do something. About the only thing that should come through is a ^C, which - will cause us to send a SIGINT to the child. */ + will cause us to request child interruption. */ static void input_interrupt (int unused) @@ -599,7 +599,7 @@ input_interrupt (int unused) return; } - (*the_target->send_signal) (SIGINT); + (*the_target->request_interrupt) (); } } #endif diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 3599208b261..b5b5f484a9c 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -551,9 +551,9 @@ spu_look_up_symbols (void) /* Send signal to inferior. */ static void -spu_send_signal (int signo) +spu_request_interrupt (void) { - syscall (SYS_tkill, current_tid, signo); + syscall (SYS_tkill, current_tid, SIGINT); } static const char * @@ -576,7 +576,7 @@ static struct target_ops spu_target_ops = { spu_read_memory, spu_write_memory, spu_look_up_symbols, - spu_send_signal, + spu_request_interrupt, NULL, NULL, NULL, diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h index d6e2655bf94..6f88b49d78b 100644 --- a/gdb/gdbserver/target.h +++ b/gdb/gdbserver/target.h @@ -127,8 +127,10 @@ struct target_ops void (*look_up_symbols) (void); - /* Send a signal to the inferior process, however is appropriate. */ - void (*send_signal) (int); + /* Send an interrupt request to the inferior process, + however is appropriate. */ + + void (*request_interrupt) (void); /* Read auxiliary vector data from the inferior process. -- 2.30.2