X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fgdbserver%2Fspu-low.c;h=898e46d6f7eb14fa7b32f781b8bfefb54e9784df;hb=54ae186fb505f4873858ae56b2298c9471f9eaee;hp=eb984101a06d3dab1bf034ccbfcfbd7425a3382a;hpb=95954743cb49efcc384c378173606fd309b6e6ac;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index eb984101a0..898e46d6f7 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -1,5 +1,6 @@ /* Low level interface to SPUs, for the remote server for GDB. - Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. Contributed by Ulrich Weigand . @@ -52,7 +53,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 +68,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 +151,7 @@ fetch_ppc_memory (CORE_ADDR memaddr, char *myaddr, int len) / 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 +176,7 @@ store_ppc_memory (CORE_ADDR memaddr, char *myaddr, int len) / 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 +241,7 @@ spu_proc_xfer_spu (const char *annex, unsigned char *readbuf, 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 +320,23 @@ 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); + int status, ret; + struct process_info *process = find_process_pid (pid); + if (process == NULL) + return -1; + + ptrace (PTRACE_KILL, pid, 0, 0); + + do { + ret = waitpid (pid, &status, 0); + if (WIFEXITED (status) || WIFSIGNALED (status)) + break; + } while (ret != -1 || errno != ECHILD); + + clear_inferiors (); + remove_process (process); return 0; } @@ -330,18 +344,30 @@ 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); + + clear_inferiors (); + remove_process (process); return 0; } +static void +spu_mourn (struct process_info *process) +{ + remove_process (process); +} + static void spu_join (int pid) { int status, ret; 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 +377,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 +388,7 @@ spu_resume (struct thread_resume *resume_info, size_t n) 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 +402,7 @@ spu_resume (struct thread_resume *resume_info, size_t n) 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 +411,13 @@ spu_resume (struct thread_resume *resume_info, size_t n) 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 +439,17 @@ spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) 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); return pid_to_ptid (ret); } else if (!WIFSTOPPED (w)) @@ -435,7 +458,6 @@ spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) ourstatus->kind = TARGET_WAITKIND_SIGNALLED; ourstatus->value.sig = target_signal_from_host (WTERMSIG (w)); clear_inferiors (); - remove_process (ret); return pid_to_ptid (ret); } @@ -455,29 +477,25 @@ spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) /* Fetch inferior registers. */ static void -spu_fetch_registers (int regno) +spu_fetch_registers (struct regcache *regcache, int regno) { int fd; CORE_ADDR addr; - /* ??? Some callers use 0 to mean all registers. */ - if (regno == 0) - regno = -1; - /* We must be stopped on a spu_run system call. */ if (!parse_spufs_run (&fd, &addr)) return; /* The ID register holds the spufs file handle. */ if (regno == -1 || regno == SPU_ID_REGNUM) - supply_register (SPU_ID_REGNUM, (char *)&fd); + supply_register (regcache, SPU_ID_REGNUM, (char *)&fd); /* The NPC register is found at ADDR. */ if (regno == -1 || regno == SPU_PC_REGNUM) { char buf[4]; if (fetch_ppc_memory (addr, buf, 4) == 0) - supply_register (SPU_PC_REGNUM, buf); + supply_register (regcache, SPU_PC_REGNUM, buf); } /* The GPRs are found in the "regs" spufs file. */ @@ -490,13 +508,13 @@ spu_fetch_registers (int regno) sprintf (annex, "%d/regs", fd); if (spu_proc_xfer_spu (annex, buf, NULL, 0, sizeof buf) == sizeof buf) for (i = 0; i < SPU_NUM_CORE_REGS; i++) - supply_register (i, buf + i*16); + supply_register (regcache, i, buf + i*16); } } /* Store inferior registers. */ static void -spu_store_registers (int regno) +spu_store_registers (struct regcache *regcache, int regno) { int fd; CORE_ADDR addr; @@ -513,7 +531,7 @@ spu_store_registers (int regno) if (regno == -1 || regno == SPU_PC_REGNUM) { char buf[4]; - collect_register (SPU_PC_REGNUM, buf); + collect_register (regcache, SPU_PC_REGNUM, buf); store_ppc_memory (addr, buf, 4); } @@ -525,7 +543,7 @@ spu_store_registers (int regno) int i; for (i = 0; i < SPU_NUM_CORE_REGS; i++) - collect_register (i, buf + i*16); + collect_register (regcache, i, buf + i*16); sprintf (annex, "%d/regs", fd); spu_proc_xfer_spu (annex, NULL, buf, 0, sizeof buf); @@ -539,7 +557,8 @@ spu_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) { int fd, ret; CORE_ADDR addr; - char annex[32]; + char annex[32], lslr_annex[32], buf[32]; + CORE_ADDR lslr; /* We must be stopped on a spu_run system call. */ if (!parse_spufs_run (&fd, &addr)) @@ -548,6 +567,22 @@ spu_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) /* Use the "mem" spufs file to access SPU local store. */ sprintf (annex, "%d/mem", fd); ret = spu_proc_xfer_spu (annex, myaddr, NULL, memaddr, len); + if (ret > 0) + return ret == len ? 0 : EIO; + + /* SPU local store access wraps the address around at the + local store limit. We emulate this here. To avoid needing + an extra access to retrieve the LSLR, we only do that after + trying the original address first, and getting end-of-file. */ + sprintf (lslr_annex, "%d/lslr", fd); + memset (buf, 0, sizeof buf); + if (spu_proc_xfer_spu (lslr_annex, (unsigned char *)buf, NULL, + 0, sizeof buf) <= 0) + return ret; + + lslr = strtoul (buf, NULL, 16); + ret = spu_proc_xfer_spu (annex, myaddr, NULL, memaddr & lslr, len); + return ret == len ? 0 : EIO; } @@ -560,7 +595,8 @@ spu_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) { int fd, ret; CORE_ADDR addr; - char annex[32]; + char annex[32], lslr_annex[32], buf[32]; + CORE_ADDR lslr; /* We must be stopped on a spu_run system call. */ if (!parse_spufs_run (&fd, &addr)) @@ -569,6 +605,22 @@ spu_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) /* Use the "mem" spufs file to access SPU local store. */ sprintf (annex, "%d/mem", fd); ret = spu_proc_xfer_spu (annex, NULL, myaddr, memaddr, len); + if (ret > 0) + return ret == len ? 0 : EIO; + + /* SPU local store access wraps the address around at the + local store limit. We emulate this here. To avoid needing + an extra access to retrieve the LSLR, we only do that after + trying the original address first, and getting end-of-file. */ + sprintf (lslr_annex, "%d/lslr", fd); + memset (buf, 0, sizeof buf); + if (spu_proc_xfer_spu (lslr_annex, (unsigned char *)buf, NULL, + 0, sizeof buf) <= 0) + return ret; + + lslr = strtoul (buf, NULL, 16); + ret = spu_proc_xfer_spu (annex, NULL, myaddr, memaddr & lslr, len); + return ret == len ? 0 : EIO; } @@ -582,7 +634,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 = { @@ -590,12 +642,15 @@ static struct target_ops spu_target_ops = { spu_attach, spu_kill, spu_detach, + spu_mourn, spu_join, spu_thread_alive, spu_resume, spu_wait, spu_fetch_registers, spu_store_registers, + NULL, /* prepare_to_access_memory */ + NULL, /* done_accessing_memory */ spu_read_memory, spu_write_memory, spu_look_up_symbols,