X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Fspu-low.c;h=5b545464e799cf1feed267275cee23fd20ad29d0;hb=476350ba4800f1144b125f6511a5e25b223cc90b;hp=2a720ae252c986e770f7dc5f4b196ac36c752614;hpb=0b30217134add051e159a192066a1e568ebd837f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 2a720ae252..5b545464e7 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -1,5 +1,5 @@ /* Low level interface to SPUs, for the remote server for GDB. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. Contributed by Ulrich Weigand . @@ -20,15 +20,13 @@ #include "server.h" -#include -#include +#include "gdb_wait.h" #include #include -#include -#include #include -#include #include +#include "filestuff.h" +#include "hostio.h" /* Some older glibc versions do not define this. */ #ifndef __WNOTHREAD @@ -51,15 +49,15 @@ #define INSTR_SC 0x44000002 #define NR_spu_run 0x0116 -/* Get current thread ID (Linux task ID). */ -#define current_ptid ((struct inferior_list_entry *)current_inferior)->id - /* These are used in remote-utils.c. */ int using_threads = 0; /* Defined in auto-generated file reg-spu.c. */ void init_registers_spu (void); +extern const struct target_desc *tdesc_spu; +/* Software breakpoint instruction. */ +static const gdb_byte breakpoint[] = { 0x00, 0x00, 0x3f, 0xff }; /* Fetch PPU register REGNO. */ static CORE_ADDR @@ -152,7 +150,7 @@ fetch_ppc_memory (CORE_ADDR memaddr, char *myaddr, int len) int tid = ptid_get_lwp (current_ptid); - buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET)); + buffer = XALLOCAVEC (PTRACE_TYPE_RET, count); for (i = 0; i < count; i++, addr += sizeof (PTRACE_TYPE_RET)) if ((ret = fetch_ppc_memory_1 (tid, addr, &buffer[i])) != 0) return ret; @@ -177,7 +175,7 @@ store_ppc_memory (CORE_ADDR memaddr, char *myaddr, int len) int tid = ptid_get_lwp (current_ptid); - buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET)); + buffer = XALLOCAVEC (PTRACE_TYPE_RET, count); if (addr != memaddr || len < (int) sizeof (PTRACE_TYPE_RET)) if ((ret = fetch_ppc_memory_1 (tid, addr, &buffer[0])) != 0) @@ -206,14 +204,14 @@ store_ppc_memory (CORE_ADDR memaddr, char *myaddr, int len) static int parse_spufs_run (int *fd, CORE_ADDR *addr) { - char buf[4]; + unsigned int insn; CORE_ADDR pc = fetch_ppc_register (32); /* nip */ /* Fetch instruction preceding current NIP. */ - if (fetch_ppc_memory (pc-4, buf, 4) != 0) + if (fetch_ppc_memory (pc-4, (char *) &insn, 4) != 0) return 0; /* It should be a "sc" instruction. */ - if (*(unsigned int *)buf != INSTR_SC) + if (insn != INSTR_SC) return 0; /* System call number should be NR_spu_run. */ if (fetch_ppc_register (0) != NR_spu_run) @@ -269,6 +267,7 @@ spu_create_inferior (char *program, char **allargs) { int pid; ptid_t ptid; + struct process_info *proc; pid = fork (); if (pid < 0) @@ -276,6 +275,7 @@ spu_create_inferior (char *program, char **allargs) if (pid == 0) { + close_most_fds (); ptrace (PTRACE_TRACEME, 0, 0, 0); setpgid (0, 0); @@ -290,7 +290,8 @@ spu_create_inferior (char *program, char **allargs) _exit (0177); } - add_process (pid, 0); + proc = add_process (pid, 0); + proc->tdesc = tdesc_spu; ptid = ptid_build (pid, pid, 0); add_thread (ptid, NULL); @@ -302,6 +303,7 @@ int spu_attach (unsigned long pid) { ptid_t ptid; + struct process_info *proc; if (ptrace (PTRACE_ATTACH, pid, 0, 0) != 0) { @@ -311,7 +313,8 @@ spu_attach (unsigned long pid) _exit (0177); } - add_process (pid, 1); + proc = add_process (pid, 1); + proc->tdesc = tdesc_spu; ptid = ptid_build (pid, pid, 0); add_thread (ptid, NULL); return 0; @@ -383,11 +386,12 @@ spu_thread_alive (ptid_t ptid) static void spu_resume (struct thread_resume *resume_info, size_t n) { + struct thread_info *thr = get_first_thread (); size_t i; for (i = 0; i < n; i++) if (ptid_equal (resume_info[i].thread, minus_one_ptid) - || ptid_equal (resume_info[i].thread, current_ptid)) + || ptid_equal (resume_info[i].thread, ptid_of (thr))) break; if (i == n) @@ -401,7 +405,7 @@ spu_resume (struct thread_resume *resume_info, size_t n) regcache_invalidate (); errno = 0; - ptrace (PTRACE_CONT, ptid_get_lwp (current_ptid), 0, resume_info[i].sig); + ptrace (PTRACE_CONT, ptid_get_lwp (ptid_of (thr)), 0, resume_info[i].sig); if (errno) perror_with_name ("ptrace"); } @@ -455,7 +459,7 @@ spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) { fprintf (stderr, "\nChild terminated with signal = %x \n", WTERMSIG (w)); ourstatus->kind = TARGET_WAITKIND_SIGNALLED; - ourstatus->value.sig = target_signal_from_host (WTERMSIG (w)); + ourstatus->value.sig = gdb_signal_from_host (WTERMSIG (w)); clear_inferiors (); return pid_to_ptid (ret); } @@ -465,12 +469,12 @@ spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) if (!server_waiting) { ourstatus->kind = TARGET_WAITKIND_STOPPED; - ourstatus->value.sig = TARGET_SIGNAL_0; + ourstatus->value.sig = GDB_SIGNAL_0; return ptid_build (ret, ret, 0); } ourstatus->kind = TARGET_WAITKIND_STOPPED; - ourstatus->value.sig = target_signal_from_host (WSTOPSIG (w)); + ourstatus->value.sig = gdb_signal_from_host (WSTOPSIG (w)); return ptid_build (ret, ret, 0); } @@ -633,11 +637,23 @@ spu_look_up_symbols (void) static void spu_request_interrupt (void) { - syscall (SYS_tkill, ptid_get_lwp (current_ptid), SIGINT); + struct thread_info *thr = get_first_thread (); + + syscall (SYS_tkill, lwpid_of (thr), SIGINT); +} + +/* Implementation of the target_ops method "sw_breakpoint_from_kind". */ + +static const gdb_byte * +spu_sw_breakpoint_from_kind (int kind, int *size) +{ + *size = sizeof breakpoint; + return breakpoint; } static struct target_ops spu_target_ops = { spu_create_inferior, + NULL, /* post_create_inferior */ spu_attach, spu_kill, spu_detach, @@ -655,22 +671,65 @@ static struct target_ops spu_target_ops = { spu_look_up_symbols, spu_request_interrupt, NULL, + NULL, /* supports_z_point_type */ NULL, NULL, + NULL, /* stopped_by_sw_breakpoint */ + NULL, /* supports_stopped_by_sw_breakpoint */ + NULL, /* stopped_by_hw_breakpoint */ + NULL, /* supports_stopped_by_hw_breakpoint */ + NULL, /* supports_hardware_single_step */ NULL, NULL, NULL, NULL, spu_proc_xfer_spu, hostio_last_error_from_errno, + NULL, /* qxfer_osdata */ + NULL, /* qxfer_siginfo */ + NULL, /* supports_non_stop */ + NULL, /* async */ + NULL, /* start_non_stop */ + NULL, /* supports_multi_process */ + NULL, /* supports_fork_events */ + NULL, /* supports_vfork_events */ + NULL, /* supports_exec_events */ + NULL, /* handle_new_gdb_connection */ + NULL, /* handle_monitor_command */ + NULL, /* core_of_thread */ + NULL, /* read_loadmap */ + NULL, /* process_qsupported */ + NULL, /* supports_tracepoints */ + NULL, /* read_pc */ + NULL, /* write_pc */ + NULL, /* thread_stopped */ + NULL, /* get_tib_address */ + NULL, /* pause_all */ + NULL, /* unpause_all */ + NULL, /* stabilize_threads */ + NULL, /* install_fast_tracepoint_jump_pad */ + NULL, /* emit_ops */ + NULL, /* supports_disable_randomization */ + NULL, /* get_min_fast_tracepoint_insn_len */ + NULL, /* qxfer_libraries_svr4 */ + NULL, /* support_agent */ + NULL, /* support_btrace */ + NULL, /* enable_btrace */ + NULL, /* disable_btrace */ + NULL, /* read_btrace */ + NULL, /* read_btrace_conf */ + NULL, /* supports_range_stepping */ + NULL, /* pid_to_exec_file */ + NULL, /* multifs_open */ + NULL, /* multifs_unlink */ + NULL, /* multifs_readlink */ + NULL, /* breakpoint_kind_from_pc */ + spu_sw_breakpoint_from_kind, }; void initialize_low (void) { - static const unsigned char breakpoint[] = { 0x00, 0x00, 0x3f, 0xff }; - set_target_ops (&spu_target_ops); - set_breakpoint_data (breakpoint, sizeof breakpoint); init_registers_spu (); }