X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgnu-nat.c;h=78276a71df6c36a0a0a1ca490941dd8fef0c7e45;hb=f2907e49910853edf3c1aec995b3c44b3bba8999;hp=0ad35ca33acd317410b0517929f4670827443f0b;hpb=223ffa714ce1cf1dc6e0c361189fa80417ff90d9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index 0ad35ca33a..78276a71df 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -1,5 +1,5 @@ /* Interface GDB to the GNU Hurd. - Copyright (C) 1992-2017 Free Software Foundation, Inc. + Copyright (C) 1992-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -52,6 +52,8 @@ extern "C" #include #include #include +#include +#include #include "inferior.h" #include "symtab.h" @@ -1094,11 +1096,11 @@ inf_validate_procs (struct inf *inf) last = thread; proc_debug (thread, "new thread: %lu", threads[i]); - ptid = ptid_build (inf->pid, thread->tid, 0); + ptid = ptid_t (inf->pid, thread->tid, 0); /* Tell GDB's generic thread code. */ - if (ptid_equal (inferior_ptid, pid_to_ptid (inf->pid))) + if (ptid_equal (inferior_ptid, ptid_t (inf->pid))) /* This is the first time we're hearing about thread ids, after a fork-child. */ thread_change_ptid (inferior_ptid, ptid); @@ -1459,9 +1461,10 @@ extern "C" int notify_server (mach_msg_header_t *, mach_msg_header_t *); extern "C" int process_reply_server (mach_msg_header_t *, mach_msg_header_t *); /* Wait for something to happen in the inferior, returning what in STATUS. */ -static ptid_t -gnu_wait (struct target_ops *ops, - ptid_t ptid, struct target_waitstatus *status, int options) + +ptid_t +gnu_nat_target::wait (ptid_t ptid, struct target_waitstatus *status, + int options) { struct msg { @@ -1613,7 +1616,7 @@ rewait: thread = inf->wait.thread; if (thread) - ptid = ptid_build (inf->pid, thread->tid, 0); + ptid = ptid_t (inf->pid, thread->tid, 0); else if (ptid_equal (ptid, minus_one_ptid)) thread = inf_tid_to_thread (inf, -1); else @@ -1623,7 +1626,7 @@ rewait: { /* TID is dead; try and find a new thread. */ if (inf_update_procs (inf) && inf->threads) - ptid = ptid_build (inf->pid, inf->threads->tid, 0); /* The first + ptid = ptid_t (inf->pid, inf->threads->tid, 0); /* The first available thread. */ else @@ -1996,9 +1999,8 @@ port_msgs_queued (mach_port_t port) still unprocessed from the last resume we did (any given resume may result in multiple events returned by wait). */ -static void -gnu_resume (struct target_ops *ops, - ptid_t ptid, int step, enum gdb_signal sig) +void +gnu_nat_target::resume (ptid_t ptid, int step, enum gdb_signal sig) { struct proc *step_thread = 0; int resume_all; @@ -2073,8 +2075,8 @@ gnu_resume (struct target_ops *ops, } -static void -gnu_kill_inferior (struct target_ops *ops) +void +gnu_nat_target::kill () { struct proc *task = gnu_current_inf->task; @@ -2088,12 +2090,12 @@ gnu_kill_inferior (struct target_ops *ops) } /* Clean up after the inferior dies. */ -static void -gnu_mourn_inferior (struct target_ops *ops) +void +gnu_nat_target::mourn_inferior () { inf_debug (gnu_current_inf, "rip"); inf_detach (gnu_current_inf); - inf_child_mourn_inferior (ops); + inf_child_target::mourn_inferior (); } @@ -2129,11 +2131,11 @@ gnu_ptrace_me (void) trace_start_error_with_name ("ptrace"); } -static void -gnu_create_inferior (struct target_ops *ops, - const char *exec_file, const std::string &allargs, - char **env, - int from_tty) +void +gnu_nat_target::create_inferior (const char *exec_file, + const std::string &allargs, + char **env, + int from_tty) { struct inf *inf = cur_inf (); int pid; @@ -2146,14 +2148,14 @@ gnu_create_inferior (struct target_ops *ops, /* We have something that executes now. We'll be running through the shell at this point (if startup-with-shell is true), but the pid shouldn't change. */ - add_thread_silent (pid_to_ptid (pid)); + add_thread_silent (ptid_t (pid)); /* Attach to the now stopped child, which is actually a shell... */ inf_debug (inf, "attaching to child: %d", pid); inf_attach (inf, pid); - push_target (ops); + push_target (this); inf->pending_execs = 1; inf->nomsg = 1; @@ -2165,7 +2167,7 @@ gnu_create_inferior (struct target_ops *ops, /* We now have thread info. */ thread_change_ptid (inferior_ptid, - ptid_build (inf->pid, inf_pick_first_thread (), 0)); + ptid_t (inf->pid, inf_pick_first_thread (), 0)); gdb_startup_inferior (pid, START_INFERIOR_TRAPS_EXPECTED); @@ -2188,8 +2190,8 @@ gnu_create_inferior (struct target_ops *ops, /* Attach to process PID, then initialize for debugging it and wait for the trace-trap that results from attaching. */ -static void -gnu_attach (struct target_ops *ops, const char *args, int from_tty) +void +gnu_nat_target::attach (const char *args, int from_tty) { int pid; char *exec_file; @@ -2218,7 +2220,7 @@ gnu_attach (struct target_ops *ops, const char *args, int from_tty) inf_attach (inf, pid); - push_target (ops); + push_target (this); inferior = current_inferior (); inferior_appeared (inferior, pid); @@ -2226,7 +2228,7 @@ gnu_attach (struct target_ops *ops, const char *args, int from_tty) inf_update_procs (inf); - inferior_ptid = ptid_build (pid, inf_pick_first_thread (), 0); + inferior_ptid = ptid_t (pid, inf_pick_first_thread (), 0); /* We have to initialize the terminal settings now, since the code below might try to restore them. */ @@ -2252,8 +2254,8 @@ gnu_attach (struct target_ops *ops, const char *args, int from_tty) to work, it may be necessary for the process to have been previously attached. It *might* work if the program was started via fork. */ -static void -gnu_detach (struct target_ops *ops, const char *args, int from_tty) +void +gnu_nat_target::detach (inferior *inf, int from_tty) { int pid; @@ -2279,21 +2281,15 @@ gnu_detach (struct target_ops *ops, const char *args, int from_tty) inf_child_maybe_unpush_target (ops); } -static void -gnu_terminal_init (struct target_ops *self) -{ - gdb_assert (gnu_current_inf); - child_terminal_init_with_pgrp (gnu_current_inf->pid); -} -static void -gnu_stop (struct target_ops *self, ptid_t ptid) +void +gnu_nat_target::stop (ptid_t ptid) { - error (_("to_stop target function not implemented")); + error (_("stop target function not implemented")); } -static int -gnu_thread_alive (struct target_ops *ops, ptid_t ptid) +bool +gnu_nat_target::thread_alive (ptid_t ptid) { inf_update_procs (gnu_current_inf); return !!inf_tid_to_thread (gnu_current_inf, @@ -2547,27 +2543,84 @@ gnu_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf, } } +/* GNU does not have auxv, but we can at least fake the AT_ENTRY entry for PIE + binaries. */ +static enum target_xfer_status +gnu_xfer_auxv (gdb_byte *readbuf, const gdb_byte *writebuf, + CORE_ADDR memaddr, ULONGEST len, ULONGEST *xfered_len) +{ + task_t task = (gnu_current_inf + ? (gnu_current_inf->task + ? gnu_current_inf->task->port : 0) + : 0); + process_t proc; + int res; + kern_return_t err; + vm_address_t entry; + ElfW(auxv_t) auxv[2]; + + if (task == MACH_PORT_NULL) + return TARGET_XFER_E_IO; + if (writebuf != NULL) + return TARGET_XFER_E_IO; + + if (memaddr == sizeof (auxv)) + return TARGET_XFER_EOF; + if (memaddr > sizeof (auxv)) + return TARGET_XFER_E_IO; + + err = proc_task2proc (proc_server, task, &proc); + if (err != 0) + return TARGET_XFER_E_IO; + + /* Get entry from proc server. */ + err = proc_get_entry (proc, &entry); + if (err != 0) + return TARGET_XFER_E_IO; + + /* Fake auxv entry. */ + auxv[0].a_type = AT_ENTRY; + auxv[0].a_un.a_val = entry; + auxv[1].a_type = AT_NULL; + auxv[1].a_un.a_val = 0; + + inf_debug (gnu_current_inf, "reading auxv %s[%s] --> %s", + paddress (target_gdbarch (), memaddr), pulongest (len), + host_address_to_string (readbuf)); + + if (memaddr + len > sizeof (auxv)) + len = sizeof (auxv) - memaddr; + + memcpy (readbuf, (gdb_byte *) &auxv + memaddr, len); + *xfered_len = len; + + return TARGET_XFER_OK; +} + /* Target to_xfer_partial implementation. */ -static enum target_xfer_status -gnu_xfer_partial (struct target_ops *ops, enum target_object object, - const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, - ULONGEST *xfered_len) +enum target_xfer_status +gnu_nat_target::xfer_partial (enum target_object object, + const char *annex, gdb_byte *readbuf, + const gdb_byte *writebuf, ULONGEST offset, + ULONGEST len, ULONGEST *xfered_len) { switch (object) { case TARGET_OBJECT_MEMORY: return gnu_xfer_memory (readbuf, writebuf, offset, len, xfered_len); + case TARGET_OBJECT_AUXV: + return gnu_xfer_auxv (readbuf, writebuf, offset, len, xfered_len); default: return TARGET_XFER_E_IO; } } /* Call FUNC on each memory region in the task. */ -static int -gnu_find_memory_regions (struct target_ops *self, - find_memory_region_ftype func, void *data) + +int +gnu_nat_target::find_memory_regions (find_memory_region_ftype func, + void *data) { kern_return_t err; task_t task; @@ -2659,8 +2712,8 @@ proc_string (struct proc *proc) return tid_str; } -static const char * -gnu_pid_to_str (struct target_ops *ops, ptid_t ptid) +const char * +gnu_nat_target::pid_to_str (ptid_t ptid) { struct inf *inf = gnu_current_inf; int tid = ptid_get_lwp (ptid); @@ -2677,33 +2730,6 @@ gnu_pid_to_str (struct target_ops *ops, ptid_t ptid) } } - -/* Create a prototype generic GNU/Hurd target. The client can - override it with local methods. */ - -struct target_ops * -gnu_target (void) -{ - struct target_ops *t = inf_child_target (); - - t->to_attach = gnu_attach; - t->to_attach_no_wait = 1; - t->to_detach = gnu_detach; - t->to_resume = gnu_resume; - t->to_wait = gnu_wait; - t->to_xfer_partial = gnu_xfer_partial; - t->to_find_memory_regions = gnu_find_memory_regions; - t->to_terminal_init = gnu_terminal_init; - t->to_kill = gnu_kill_inferior; - t->to_create_inferior = gnu_create_inferior; - t->to_mourn_inferior = gnu_mourn_inferior; - t->to_thread_alive = gnu_thread_alive; - t->to_pid_to_str = gnu_pid_to_str; - t->to_stop = gnu_stop; - - return t; -} - /* User task commands. */ @@ -2721,35 +2747,35 @@ struct cmd_list_element *set_thread_default_cmd_list = NULL; struct cmd_list_element *show_thread_default_cmd_list = NULL; static void -set_thread_cmd (char *args, int from_tty) +set_thread_cmd (const char *args, int from_tty) { printf_unfiltered ("\"set thread\" must be followed by the " "name of a thread property, or \"default\".\n"); } static void -show_thread_cmd (char *args, int from_tty) +show_thread_cmd (const char *args, int from_tty) { printf_unfiltered ("\"show thread\" must be followed by the " "name of a thread property, or \"default\".\n"); } static void -set_thread_default_cmd (char *args, int from_tty) +set_thread_default_cmd (const char *args, int from_tty) { printf_unfiltered ("\"set thread default\" must be followed " "by the name of a thread property.\n"); } static void -show_thread_default_cmd (char *args, int from_tty) +show_thread_default_cmd (const char *args, int from_tty) { printf_unfiltered ("\"show thread default\" must be followed " "by the name of a thread property.\n"); } static int -parse_int_arg (char *args, char *cmd_prefix) +parse_int_arg (const char *args, char *cmd_prefix) { if (args) { @@ -2764,7 +2790,7 @@ parse_int_arg (char *args, char *cmd_prefix) } static int -_parse_bool_arg (char *args, char *t_val, char *f_val, char *cmd_prefix) +_parse_bool_arg (const char *args, char *t_val, char *f_val, char *cmd_prefix) { if (!args || strcmp (args, t_val) == 0) return 1; @@ -2780,7 +2806,7 @@ _parse_bool_arg (char *args, char *t_val, char *f_val, char *cmd_prefix) _parse_bool_arg (args, "on", "off", cmd_prefix) static void -check_empty (char *args, char *cmd_prefix) +check_empty (const char *args, char *cmd_prefix) { if (args) error (_("Garbage after \"%s\" command: `%s'"), cmd_prefix, args); @@ -2825,13 +2851,13 @@ set_task_pause_cmd (int arg, int from_tty) } static void -set_task_pause_cmd (char *args, int from_tty) +set_task_pause_cmd (const char *args, int from_tty) { set_task_pause_cmd (parse_bool_arg (args, "set task pause"), from_tty); } static void -show_task_pause_cmd (char *args, int from_tty) +show_task_pause_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -2843,14 +2869,14 @@ show_task_pause_cmd (char *args, int from_tty) } static void -set_task_detach_sc_cmd (char *args, int from_tty) +set_task_detach_sc_cmd (const char *args, int from_tty) { cur_inf ()->detach_sc = parse_int_arg (args, "set task detach-suspend-count"); } static void -show_task_detach_sc_cmd (char *args, int from_tty) +show_task_detach_sc_cmd (const char *args, int from_tty) { check_empty (args, "show task detach-suspend-count"); printf_unfiltered ("The inferior task will be left with a " @@ -2860,7 +2886,7 @@ show_task_detach_sc_cmd (char *args, int from_tty) static void -set_thread_default_pause_cmd (char *args, int from_tty) +set_thread_default_pause_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -2869,7 +2895,7 @@ set_thread_default_pause_cmd (char *args, int from_tty) } static void -show_thread_default_pause_cmd (char *args, int from_tty) +show_thread_default_pause_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); int sc = inf->default_thread_pause_sc; @@ -2881,7 +2907,7 @@ show_thread_default_pause_cmd (char *args, int from_tty) } static void -set_thread_default_run_cmd (char *args, int from_tty) +set_thread_default_run_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -2890,7 +2916,7 @@ set_thread_default_run_cmd (char *args, int from_tty) } static void -show_thread_default_run_cmd (char *args, int from_tty) +show_thread_default_run_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -2900,14 +2926,14 @@ show_thread_default_run_cmd (char *args, int from_tty) } static void -set_thread_default_detach_sc_cmd (char *args, int from_tty) +set_thread_default_detach_sc_cmd (const char *args, int from_tty) { cur_inf ()->default_thread_detach_sc = parse_int_arg (args, "set thread default detach-suspend-count"); } static void -show_thread_default_detach_sc_cmd (char *args, int from_tty) +show_thread_default_detach_sc_cmd (const char *args, int from_tty) { check_empty (args, "show thread default detach-suspend-count"); printf_unfiltered ("New threads will get a detach-suspend-count of %d.\n", @@ -2953,7 +2979,7 @@ steal_exc_port (struct proc *proc, mach_port_t name) } static void -set_task_exc_port_cmd (char *args, int from_tty) +set_task_exc_port_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -2963,13 +2989,13 @@ set_task_exc_port_cmd (char *args, int from_tty) } static void -set_stopped_cmd (char *args, int from_tty) +set_stopped_cmd (const char *args, int from_tty) { cur_inf ()->stopped = _parse_bool_arg (args, "yes", "no", "set stopped"); } static void -show_stopped_cmd (char *args, int from_tty) +show_stopped_cmd (const char *args, int from_tty) { struct inf *inf = active_inf (); @@ -2979,7 +3005,7 @@ show_stopped_cmd (char *args, int from_tty) } static void -set_sig_thread_cmd (char *args, int from_tty) +set_sig_thread_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -2997,7 +3023,7 @@ set_sig_thread_cmd (char *args, int from_tty) } static void -show_sig_thread_cmd (char *args, int from_tty) +show_sig_thread_cmd (const char *args, int from_tty) { struct inf *inf = active_inf (); @@ -3023,13 +3049,13 @@ set_signals_cmd (int arg, int from_tty) } static void -set_signals_cmd (char *args, int from_tty) +set_signals_cmd (const char *args, int from_tty) { set_signals_cmd(parse_bool_arg (args, "set signals"), from_tty); } static void -show_signals_cmd (char *args, int from_tty) +show_signals_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -3052,13 +3078,13 @@ set_exceptions_cmd (int arg, int from_tty) } static void -set_exceptions_cmd (char *args, int from_tty) +set_exceptions_cmd (const char *args, int from_tty) { set_exceptions_cmd (parse_bool_arg (args, "set exceptions"), from_tty); } static void -show_exceptions_cmd (char *args, int from_tty) +show_exceptions_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -3071,14 +3097,14 @@ show_exceptions_cmd (char *args, int from_tty) static void -set_task_cmd (char *args, int from_tty) +set_task_cmd (const char *args, int from_tty) { printf_unfiltered ("\"set task\" must be followed by the name" " of a task property.\n"); } static void -show_task_cmd (char *args, int from_tty) +show_task_cmd (const char *args, int from_tty) { struct inf *inf = cur_inf (); @@ -3106,7 +3132,7 @@ show_task_cmd (char *args, int from_tty) static void -set_noninvasive_cmd (char *args, int from_tty) +set_noninvasive_cmd (const char *args, int from_tty) { /* Invert the sense of the arg for each component. */ int inv_arg = parse_bool_arg (args, "set noninvasive") ? 0 : 1; @@ -3152,31 +3178,31 @@ info_port_rights (const char *args, mach_port_type_t only) } static void -info_send_rights_cmd (char *args, int from_tty) +info_send_rights_cmd (const char *args, int from_tty) { info_port_rights (args, MACH_PORT_TYPE_SEND); } static void -info_recv_rights_cmd (char *args, int from_tty) +info_recv_rights_cmd (const char *args, int from_tty) { info_port_rights (args, MACH_PORT_TYPE_RECEIVE); } static void -info_port_sets_cmd (char *args, int from_tty) +info_port_sets_cmd (const char *args, int from_tty) { info_port_rights (args, MACH_PORT_TYPE_PORT_SET); } static void -info_dead_names_cmd (char *args, int from_tty) +info_dead_names_cmd (const char *args, int from_tty) { info_port_rights (args, MACH_PORT_TYPE_DEAD_NAME); } static void -info_port_rights_cmd (char *args, int from_tty) +info_port_rights_cmd (const char *args, int from_tty) { info_port_rights (args, ~0); } @@ -3308,7 +3334,7 @@ This is the same as setting `task pause', `exceptions', and\n\ static void -set_thread_pause_cmd (char *args, int from_tty) +set_thread_pause_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread (); int old_sc = thread->pause_sc; @@ -3321,7 +3347,7 @@ set_thread_pause_cmd (char *args, int from_tty) } static void -show_thread_pause_cmd (char *args, int from_tty) +show_thread_pause_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread (); int sc = thread->pause_sc; @@ -3334,7 +3360,7 @@ show_thread_pause_cmd (char *args, int from_tty) } static void -set_thread_run_cmd (char *args, int from_tty) +set_thread_run_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread (); @@ -3342,7 +3368,7 @@ set_thread_run_cmd (char *args, int from_tty) } static void -show_thread_run_cmd (char *args, int from_tty) +show_thread_run_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread (); @@ -3353,14 +3379,14 @@ show_thread_run_cmd (char *args, int from_tty) } static void -set_thread_detach_sc_cmd (char *args, int from_tty) +set_thread_detach_sc_cmd (const char *args, int from_tty) { cur_thread ()->detach_sc = parse_int_arg (args, "set thread detach-suspend-count"); } static void -show_thread_detach_sc_cmd (char *args, int from_tty) +show_thread_detach_sc_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread (); @@ -3372,7 +3398,7 @@ show_thread_detach_sc_cmd (char *args, int from_tty) } static void -set_thread_exc_port_cmd (char *args, int from_tty) +set_thread_exc_port_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread (); @@ -3396,7 +3422,7 @@ show_thread_cmd (char *args, int from_tty) #endif static void -thread_takeover_sc_cmd (char *args, int from_tty) +thread_takeover_sc_cmd (const char *args, int from_tty) { struct proc *thread = cur_thread ();