X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgnu-nat.c;h=c268732b3bdc4ccf31065e41d969639b3eb87d52;hb=2b2798cc9716f45f752ea03411b6f9c9afc17cc6;hp=ac981931247b51fb175243ac38a1835dbf1743cd;hpb=842c05cd1acd244a962d89a824b4b496ce965556;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index ac98193124..c268732b3b 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -1,5 +1,5 @@ /* Interface GDB to the GNU Hurd. - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -23,12 +23,9 @@ #include "defs.h" #include -#include #include #include #include -#include -#include #include #include @@ -61,7 +58,6 @@ #include "gdbcmd.h" #include "gdbcore.h" #include "gdbthread.h" -#include "gdb_assert.h" #include "gdb_obstack.h" #include "gnu-nat.h" @@ -543,7 +539,7 @@ make_proc (struct inf *inf, mach_port_t port, int tid) { error_t err; mach_port_t prev_port = MACH_PORT_NULL; - struct proc *proc = xmalloc (sizeof (struct proc)); + struct proc *proc = XNEW (struct proc); proc->port = port; proc->tid = tid; @@ -640,7 +636,7 @@ _proc_free (struct proc *proc) static struct inf * make_inf (void) { - struct inf *inf = xmalloc (sizeof (struct inf)); + struct inf *inf = XNEW (struct inf); inf->task = 0; inf->threads = 0; @@ -808,7 +804,8 @@ inf_validate_procinfo (struct inf *inf) inf->nomsg = !!(pi->state & PI_NOMSG); if (inf->nomsg) inf->traced = !!(pi->state & PI_TRACED); - vm_deallocate (mach_task_self (), (vm_address_t) pi, pi_len); + vm_deallocate (mach_task_self (), (vm_address_t) pi, + pi_len * sizeof (*(procinfo_t) 0)); if (noise_len > 0) vm_deallocate (mach_task_self (), (vm_address_t) noise, noise_len); } @@ -848,21 +845,16 @@ inf_validate_task_sc (struct inf *inf) suspend_count = pi->taskinfo.suspend_count; - vm_deallocate (mach_task_self (), (vm_address_t) pi, pi_len); + vm_deallocate (mach_task_self (), (vm_address_t) pi, + pi_len * sizeof (*(procinfo_t) 0)); if (noise_len > 0) - vm_deallocate (mach_task_self (), (vm_address_t) pi, pi_len); + vm_deallocate (mach_task_self (), (vm_address_t) noise, noise_len); if (inf->task->cur_sc < suspend_count) { - int abort; - - target_terminal_ours (); /* Allow I/O. */ - abort = !query (_("Pid %d has an additional task suspend count of %d;" - " clear it? "), inf->pid, - suspend_count - inf->task->cur_sc); - target_terminal_inferior (); /* Give it back to the child. */ - - if (abort) + if (!query (_("Pid %d has an additional task suspend count of %d;" + " clear it? "), inf->pid, + suspend_count - inf->task->cur_sc)) error (_("Additional task suspend count left untouched.")); inf->task->cur_sc = suspend_count; @@ -987,6 +979,17 @@ inf_port_to_thread (struct inf *inf, mach_port_t port) return 0; } +/* See gnu-nat.h. */ + +void +inf_threads (struct inf *inf, inf_threads_ftype *f, void *arg) +{ + struct proc *thread; + + for (thread = inf->threads; thread; thread = thread->next) + f (thread, arg); +} + /* Make INF's list of threads be consistent with reality of TASK. */ void @@ -2080,8 +2083,7 @@ gnu_mourn_inferior (struct target_ops *ops) { inf_debug (gnu_current_inf, "rip"); inf_detach (gnu_current_inf); - unpush_target (ops); - generic_mourn_inferior (); + inf_child_mourn_inferior (ops); } @@ -2166,7 +2168,7 @@ 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, char *args, int from_tty) +gnu_attach (struct target_ops *ops, const char *args, int from_tty) { int pid; char *exec_file; @@ -2253,18 +2255,18 @@ gnu_detach (struct target_ops *ops, const char *args, int from_tty) inferior_ptid = null_ptid; detach_inferior (pid); - unpush_target (ops); /* Pop out of handling an inferior. */ + inf_child_maybe_unpush_target (ops); } static void -gnu_terminal_init_inferior (void) +gnu_terminal_init (struct target_ops *self) { gdb_assert (gnu_current_inf); - terminal_init_inferior_with_pgrp (gnu_current_inf->pid); + child_terminal_init_with_pgrp (gnu_current_inf->pid); } static void -gnu_stop (ptid_t ptid) +gnu_stop (struct target_ops *self, ptid_t ptid) { error (_("to_stop target function not implemented")); } @@ -2342,7 +2344,7 @@ gnu_write_inferior (task_t task, CORE_ADDR addr, char *errstr = "Bug in gnu_write_inferior"; struct vm_region_list *region_element; - struct vm_region_list *region_head = (struct vm_region_list *) NULL; + struct vm_region_list *region_head = NULL; /* Get memory from inferior with page aligned addresses. */ err = vm_read (task, @@ -2411,9 +2413,7 @@ gnu_write_inferior (task_t task, CORE_ADDR addr, } /* Chain the regions for later use. */ - region_element = - (struct vm_region_list *) - obstack_alloc (®ion_obstack, sizeof (struct vm_region_list)); + region_element = XOBNEW (®ion_obstack, struct vm_region_list); region_element->protection = protection; region_element->start = region_address; @@ -2545,7 +2545,8 @@ gnu_xfer_partial (struct target_ops *ops, enum target_object object, /* Call FUNC on each memory region in the task. */ static int -gnu_find_memory_regions (find_memory_region_ftype func, void *data) +gnu_find_memory_regions (struct target_ops *self, + find_memory_region_ftype func, void *data) { error_t err; task_t task; @@ -2664,10 +2665,6 @@ gnu_target (void) { struct target_ops *t = inf_child_target (); - t->to_shortname = "GNU"; - t->to_longname = "GNU Hurd process"; - t->to_doc = "GNU Hurd process"; - t->to_attach = gnu_attach; t->to_attach_no_wait = 1; t->to_detach = gnu_detach; @@ -2675,7 +2672,7 @@ gnu_target (void) 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_inferior; + 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; @@ -3261,21 +3258,16 @@ This is the same as setting `task pause', `exceptions', and\n\ &setlist); /* Commands to show information about the task's ports. */ - add_cmd ("send-rights", class_info, info_send_rights_cmd, - _("Show information about the task's send rights"), - &infolist); - add_cmd ("receive-rights", class_info, info_recv_rights_cmd, - _("Show information about the task's receive rights"), - &infolist); - add_cmd ("port-rights", class_info, info_port_rights_cmd, - _("Show information about the task's port rights"), - &infolist); - add_cmd ("port-sets", class_info, info_port_sets_cmd, - _("Show information about the task's port sets"), - &infolist); - add_cmd ("dead-names", class_info, info_dead_names_cmd, - _("Show information about the task's dead names"), - &infolist); + add_info ("send-rights", info_send_rights_cmd, + _("Show information about the task's send rights")); + add_info ("receive-rights", info_recv_rights_cmd, + _("Show information about the task's receive rights")); + add_info ("port-rights", info_port_rights_cmd, + _("Show information about the task's port rights")); + add_info ("port-sets", info_port_sets_cmd, + _("Show information about the task's port sets")); + add_info ("dead-names", info_dead_names_cmd, + _("Show information about the task's dead names")); add_info_alias ("ports", "port-rights", 1); add_info_alias ("port", "port-rights", 1); add_info_alias ("psets", "port-sets", 1);