From 423ec54cd3a05bdd5835076e3afe962fe4dd025b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 6 Sep 2010 13:59:03 +0000 Subject: [PATCH] gdb/ * corelow.c (core_open): Use target_signal_from_host if CORE_GDBARCH is NULL. * fork-child.c (startup_inferior) : Use enum target_signal type. * linux-nat.c (linux_nat_resume): Use target_signal_to_host before calling strsignal. Use enum target_signal type for saved_signo. (linux_handle_extended_wait) : Use enum target_signal type. (linux_nat_wait_1): Use enum target_signal type for signo. Use target_signal_to_host before calling strsignal. * remote-m32r-sdi.c (m32r_wait, m32r_detach): Replace 0 by TARGET_SIGNAL_0. gdb/gdbserver/ * target.c (mywait) : Fix to use INTEGER. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/corelow.c | 21 ++++++++++++--------- gdb/fork-child.c | 2 +- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/target.c | 2 +- gdb/linux-nat.c | 16 ++++++++++------ gdb/remote-m32r-sdi.c | 4 ++-- 7 files changed, 45 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6e3c37744a6..6a28be1e26a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2010-09-06 Jan Kratochvil + Pedro Alves + + * corelow.c (core_open): Use target_signal_from_host if CORE_GDBARCH + is NULL. + * fork-child.c (startup_inferior) : Use enum + target_signal type. + * linux-nat.c (linux_nat_resume): Use target_signal_to_host before + calling strsignal. Use enum target_signal type for saved_signo. + (linux_handle_extended_wait) : Use enum target_signal type. + (linux_nat_wait_1): Use enum target_signal type for signo. Use + target_signal_to_host before calling strsignal. + * remote-m32r-sdi.c (m32r_wait, m32r_detach): Replace 0 by + TARGET_SIGNAL_0. + 2010-09-06 Pedro Alves Jan Kratochvil diff --git a/gdb/corelow.c b/gdb/corelow.c index 6e97962bfb3..e138ff28159 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -429,15 +429,18 @@ core_open (char *filename, int from_tty) siggy = bfd_core_file_failing_signal (core_bfd); if (siggy > 0) - /* NOTE: target_signal_from_host() converts a target signal value - into gdb's internal signal value. Unfortunately gdb's internal - value is called ``target_signal'' and this function got the - name ..._from_host(). */ - printf_filtered (_("Program terminated with signal %d, %s.\n"), siggy, - target_signal_to_string ( - (core_gdbarch != NULL) ? - gdbarch_target_signal_from_host (core_gdbarch, siggy) - : siggy)); + { + /* NOTE: target_signal_from_host() converts a target signal value + into gdb's internal signal value. Unfortunately gdb's internal + value is called ``target_signal'' and this function got the + name ..._from_host(). */ + enum target_signal sig = (core_gdbarch != NULL + ? gdbarch_target_signal_from_host (core_gdbarch, siggy) + : target_signal_from_host (siggy)); + + printf_filtered (_("Program terminated with signal %d, %s.\n"), siggy, + target_signal_to_string (sig)); + } /* Fetch all registers from core file. */ target_fetch_registers (get_current_regcache (), -1); diff --git a/gdb/fork-child.c b/gdb/fork-child.c index 2b085ffe6ae..7b81e8f788b 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -448,7 +448,7 @@ startup_inferior (int ntraps) while (1) { - int resume_signal = TARGET_SIGNAL_0; + enum target_signal resume_signal = TARGET_SIGNAL_0; ptid_t event_ptid; struct target_waitstatus ws; diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index f06e6bf47a9..d0fbbb535b0 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2010-09-06 Jan Kratochvil + + * target.c (mywait) : Fix to use INTEGER. + 2010-09-06 Pedro Alves * Makefile.in (install-only): Replace $IPA_DEPFILES with diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index 21dd377f995..78630b0abfc 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -98,7 +98,7 @@ mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options, if (ourstatus->kind == TARGET_WAITKIND_EXITED) fprintf (stderr, - "\nChild exited with status %d\n", ourstatus->value.sig); + "\nChild exited with status %d\n", ourstatus->value.integer); else if (ourstatus->kind == TARGET_WAITKIND_SIGNALLED) fprintf (stderr, "\nChild terminated with signal = 0x%x (%s)\n", target_signal_to_host (ourstatus->value.sig), diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index fc9dafec21d..0e18034994b 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -1874,7 +1874,8 @@ linux_nat_resume (struct target_ops *ops, "LLR: Preparing to %s %s, %s, inferior_ptid %s\n", step ? "step" : "resume", target_pid_to_str (ptid), - signo ? strsignal (signo) : "0", + (signo != TARGET_SIGNAL_0 + ? strsignal (target_signal_to_host (signo)) : "0"), target_pid_to_str (inferior_ptid)); block_child_signals (&prev_mask); @@ -1907,7 +1908,7 @@ linux_nat_resume (struct target_ops *ops, if (lp->status && WIFSTOPPED (lp->status)) { - int saved_signo; + enum target_signal saved_signo; struct inferior *inf; inf = find_inferior_pid (ptid_get_pid (lp->ptid)); @@ -1974,7 +1975,8 @@ linux_nat_resume (struct target_ops *ops, "LLR: %s %s, %s (resume event thread)\n", step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT", target_pid_to_str (ptid), - signo ? strsignal (signo) : "0"); + (signo != TARGET_SIGNAL_0 + ? strsignal (target_signal_to_host (signo)) : "0")); restore_child_signals_mask (&prev_mask); if (target_can_async_p ()) @@ -2266,7 +2268,7 @@ linux_handle_extended_wait (struct lwp_info *lp, int status, catchpoints. */ if (!stopping) { - int signo; + enum target_signal signo; new_lp->stopped = 0; new_lp->resumed = 1; @@ -3567,7 +3569,7 @@ retry: if (WIFSTOPPED (status)) { - int signo = target_signal_from_host (WSTOPSIG (status)); + enum target_signal signo = target_signal_from_host (WSTOPSIG (status)); struct inferior *inf; inf = find_inferior_pid (ptid_get_pid (lp->ptid)); @@ -3597,7 +3599,9 @@ retry: lp->step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT", target_pid_to_str (lp->ptid), - signo ? strsignal (signo) : "0"); + (signo != TARGET_SIGNAL_0 + ? strsignal (target_signal_to_host (signo)) + : "0")); lp->stopped = 0; goto retry; } diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c index ca450d5ec35..a1e88fbb459 100644 --- a/gdb/remote-m32r-sdi.c +++ b/gdb/remote-m32r-sdi.c @@ -715,7 +715,7 @@ m32r_wait (struct target_ops *ops, fprintf_unfiltered (gdb_stdlog, "m32r_wait()\n"); status->kind = TARGET_WAITKIND_EXITED; - status->value.sig = 0; + status->value.sig = TARGET_SIGNAL_0; interrupted = 0; prev_sigint = signal (SIGINT, gdb_cntrl_c); @@ -886,7 +886,7 @@ m32r_detach (struct target_ops *ops, char *args, int from_tty) if (remote_debug) fprintf_unfiltered (gdb_stdlog, "m32r_detach(%d)\n", from_tty); - m32r_resume (ops, inferior_ptid, 0, 0); + m32r_resume (ops, inferior_ptid, 0, TARGET_SIGNAL_0); /* calls m32r_close to do the real work */ pop_target (); -- 2.30.2