From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4579 invoked by alias); 3 Apr 2009 14:40:56 -0000 Received: (qmail 4177 invoked by uid 22791); 3 Apr 2009 14:40:55 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,SPF_SOFTFAIL X-Spam-Check-By: sourceware.org Received: from mtagate2.de.ibm.com (HELO mtagate2.de.ibm.com) (195.212.17.162) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 03 Apr 2009 14:40:47 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate2.de.ibm.com (8.13.1/8.13.1) with ESMTP id n33EejAM023829 for ; Fri, 3 Apr 2009 14:40:45 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n33Eei0S4300876 for ; Fri, 3 Apr 2009 16:40:44 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n33Eei14024043 for ; Fri, 3 Apr 2009 16:40:44 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id n33Eeh93024037 for ; Fri, 3 Apr 2009 16:40:43 +0200 Message-Id: <200904031440.n33Eeh93024037@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 03 Apr 2009 16:40:43 +0200 Subject: [commit, gdbserver] Fix gdbserver on SPU To: gdb-patches@sourceware.org Date: Fri, 03 Apr 2009 14:40:00 -0000 From: "Ulrich Weigand" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-04/txt/msg00061.txt.bz2 Hello, this patch fixes gdbserver for the SPU target, which was quite broken since the recent multi-process merge. Many of the spu-low.c routines were not fully adapted to common code changes, so it didn't even compile ... In addition, I've run into a bug in prepare_resume_reply: it wouldn't null-terminate the T packet on targets without thread support, causing GDB to receive garbage. Tested on spu-elf, both native and in local gdbserver mode. Committed to mainline. Bye, Ulrich ChangeLog: * remote-utils.c (prepare_resume_reply): Null-terminate packet. * spu-low.c (current_tid): Rename to ... (current_ptid): ... this. (fetch_ppc_register, fetch_ppc_memory, store_ppc_memory, spu_proc_xfer_spu, spu_resume, spu_request_interrupt): Use ptid_get_lwp (current_ptid) instead of current_tid. (spu_kill, spu_detach, spu_join, spu_wait): Use pid argument instead of current_tid. Use find_process_pid to verify pid argument is valid. Pass proper argument to remove_process. (spu_thread_alive): Compare current_ptid instead of current_tid. (spu_resume): Likewise. Index: gdb/gdbserver/remote-utils.c =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/remote-utils.c,v retrieving revision 1.65 diff -u -p -r1.65 remote-utils.c --- gdb/gdbserver/remote-utils.c 1 Apr 2009 22:50:24 -0000 1.65 +++ gdb/gdbserver/remote-utils.c 3 Apr 2009 12:57:04 -0000 @@ -1118,6 +1118,7 @@ prepare_resume_reply (char *buf, ptid_t buf = outreg (find_regno (*regp), buf); regp ++; } + *buf = '\0'; /* Formerly, if the debugger had not used any thread features we would not burden it with a thread status response. This Index: gdb/gdbserver/spu-low.c =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/spu-low.c,v retrieving revision 1.23 diff -u -p -r1.23 spu-low.c --- gdb/gdbserver/spu-low.c 1 Apr 2009 22:50:24 -0000 1.23 +++ gdb/gdbserver/spu-low.c 3 Apr 2009 12:57:04 -0000 @@ -52,7 +52,7 @@ #define NR_spu_run 0x0116 /* Get current thread ID (Linux task ID). */ -#define current_tid ((struct inferior_list_entry *)current_inferior)->id +#define current_ptid ((struct inferior_list_entry *)current_inferior)->id /* These are used in remote-utils.c. */ int using_threads = 0; @@ -67,7 +67,7 @@ fetch_ppc_register (int regno) { PTRACE_TYPE_RET res; - int tid = current_tid; + int tid = ptid_get_lwp (current_ptid); #ifndef __powerpc64__ /* If running as a 32-bit process on a 64-bit system, we attempt @@ -150,7 +150,7 @@ fetch_ppc_memory (CORE_ADDR memaddr, cha / sizeof (PTRACE_TYPE_RET)); PTRACE_TYPE_RET *buffer; - int tid = current_tid; + int tid = ptid_get_lwp (current_ptid); buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET)); for (i = 0; i < count; i++, addr += sizeof (PTRACE_TYPE_RET)) @@ -175,7 +175,7 @@ store_ppc_memory (CORE_ADDR memaddr, cha / sizeof (PTRACE_TYPE_RET)); PTRACE_TYPE_RET *buffer; - int tid = current_tid; + int tid = ptid_get_lwp (current_ptid); buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET)); @@ -240,7 +240,7 @@ spu_proc_xfer_spu (const char *annex, un if (!annex) return 0; - sprintf (buf, "/proc/%ld/fd/%s", current_tid, annex); + sprintf (buf, "/proc/%ld/fd/%s", ptid_get_lwp (current_ptid), annex); fd = open (buf, writebuf? O_WRONLY : O_RDONLY); if (fd <= 0) return -1; @@ -319,10 +319,14 @@ spu_attach (unsigned long pid) /* Kill the inferior process. */ static int -spu_kill (int) +spu_kill (int pid) { - ptrace (PTRACE_KILL, current_tid, 0, 0); - remove_process (pid); + struct process_info *process = find_process_pid (pid); + if (process == NULL) + return -1; + + ptrace (PTRACE_KILL, pid, 0, 0); + remove_process (process); return 0; } @@ -330,8 +334,12 @@ spu_kill (int) static int spu_detach (int pid) { - ptrace (PTRACE_DETACH, current_tid, 0, 0); - remove_process (pid); + struct process_info *process = find_process_pid (pid); + if (process == NULL) + return -1; + + ptrace (PTRACE_DETACH, pid, 0, 0); + remove_process (process); return 0; } @@ -339,9 +347,14 @@ static void spu_join (int pid) { int status, ret; + struct process_info *process; + + process = find_process_pid (pid); + if (process == NULL) + return; do { - ret = waitpid (current_tid, &status, 0); + ret = waitpid (pid, &status, 0); if (WIFEXITED (status) || WIFSIGNALED (status)) break; } while (ret != -1 || errno != ECHILD); @@ -351,7 +364,7 @@ spu_join (int pid) static int spu_thread_alive (ptid_t ptid) { - return ptid_get_lwp (ptid) == current_tid; + return ptid_equal (ptid, current_ptid); } /* Resume process. */ @@ -362,7 +375,7 @@ spu_resume (struct thread_resume *resume for (i = 0; i < n; i++) if (ptid_equal (resume_info[i].thread, minus_one_ptid) - || ptid_get_lwp (resume_info[i].thread) == current_tid) + || ptid_equal (resume_info[i].thread, current_ptid)) break; if (i == n) @@ -376,7 +389,7 @@ spu_resume (struct thread_resume *resume regcache_invalidate (); errno = 0; - ptrace (PTRACE_CONT, current_tid, 0, resume_info[i].sig); + ptrace (PTRACE_CONT, ptid_get_lwp (current_ptid), 0, resume_info[i].sig); if (errno) perror_with_name ("ptrace"); } @@ -385,13 +398,13 @@ spu_resume (struct thread_resume *resume static ptid_t spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) { - int tid = current_tid; + int pid = ptid_get_pid (ptid); int w; int ret; while (1) { - ret = waitpid (tid, &w, WNOHANG | __WALL | __WNOTHREAD); + ret = waitpid (pid, &w, WNOHANG | __WALL | __WNOTHREAD); if (ret == -1) { @@ -413,20 +426,18 @@ spu_wait (ptid_t ptid, struct target_wai while (!parse_spufs_run (&fd, &addr)) { - ptrace (PT_SYSCALL, tid, (PTRACE_TYPE_ARG3) 0, 0); - waitpid (tid, NULL, __WALL | __WNOTHREAD); + ptrace (PT_SYSCALL, pid, (PTRACE_TYPE_ARG3) 0, 0); + waitpid (pid, NULL, __WALL | __WNOTHREAD); } } - ret = current_tid; - if (WIFEXITED (w)) { fprintf (stderr, "\nChild exited with retcode = %x \n", WEXITSTATUS (w)); ourstatus->kind = TARGET_WAITKIND_EXITED; ourstatus->value.integer = WEXITSTATUS (w); clear_inferiors (); - remove_process (ret); + remove_process (find_process_pid (ret)); return pid_to_ptid (ret); } else if (!WIFSTOPPED (w)) @@ -435,7 +446,7 @@ spu_wait (ptid_t ptid, struct target_wai ourstatus->kind = TARGET_WAITKIND_SIGNALLED; ourstatus->value.sig = target_signal_from_host (WTERMSIG (w)); clear_inferiors (); - remove_process (ret); + remove_process (find_process_pid (ret)); return pid_to_ptid (ret); } @@ -582,7 +593,7 @@ spu_look_up_symbols (void) static void spu_request_interrupt (void) { - syscall (SYS_tkill, current_tid, SIGINT); + syscall (SYS_tkill, ptid_get_lwp (current_ptid), SIGINT); } static struct target_ops spu_target_ops = { -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com