X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fgnu-nat.c;h=d17a7503c60b57830dda515f16caa9b0006d8142;hb=711833262c7a413b10a32f01153454bc5a53a5a6;hp=efafc3557580bef14f3c79a98674c1a2d5d0eb70;hpb=edcc890fce07a26950e5a24f4edc7664b0d4e1f5;p=platform%2Fupstream%2Fbinutils.git diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index efafc35..d17a750 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -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" @@ -210,9 +206,9 @@ struct inf unsigned int no_wait:1; /* When starting a new inferior, we don't try to validate threads until all - the proper execs have been done. This is a count of how many execs we + the proper execs have been done, which this flag states we still expect to happen. */ - unsigned pending_execs; + unsigned int pending_execs:1; /* Fields describing global state. */ @@ -404,7 +400,7 @@ proc_get_exception_port (struct proc * proc, mach_port_t * port) error_t proc_set_exception_port (struct proc * proc, mach_port_t port) { - proc_debug (proc, "setting exception port: %d", port); + proc_debug (proc, "setting exception port: %lu", port); if (proc_is_task (proc)) return task_set_exception_port (proc->port, port); else @@ -444,7 +440,7 @@ proc_steal_exc_port (struct proc *proc, mach_port_t exc_port) { error_t err = 0; - proc_debug (proc, "inserting exception port: %d", exc_port); + proc_debug (proc, "inserting exception port: %lu", exc_port); if (cur_exc_port != exc_port) /* Put in our exception port. */ @@ -465,7 +461,7 @@ proc_steal_exc_port (struct proc *proc, mach_port_t exc_port) proc->saved_exc_port = cur_exc_port; } - proc_debug (proc, "saved exception port: %d", proc->saved_exc_port); + proc_debug (proc, "saved exception port: %lu", proc->saved_exc_port); if (!err) proc->exc_port = exc_port; @@ -577,11 +573,11 @@ make_proc (struct inf *inf, mach_port_t port, int tid) MACH_MSG_TYPE_MAKE_SEND_ONCE, &prev_port); if (err) - warning (_("Couldn't request notification for port %d: %s"), + warning (_("Couldn't request notification for port %lu: %s"), port, safe_strerror (err)); else { - proc_debug (proc, "notifications to: %d", inf->event_port); + proc_debug (proc, "notifications to: %lu", inf->event_port); if (prev_port != MACH_PORT_NULL) mach_port_deallocate (mach_task_self (), prev_port); } @@ -756,7 +752,7 @@ inf_set_pid (struct inf *inf, pid_t pid) pid, safe_strerror (err)); } - inf_debug (inf, "setting task: %d", task_port); + inf_debug (inf, "setting task: %lu", task_port); if (inf->pause_sc) task_suspend (task_port); @@ -987,6 +983,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 @@ -1080,7 +1087,7 @@ inf_validate_procs (struct inf *inf) else inf->threads = thread; last = thread; - proc_debug (thread, "new thread: %d", threads[i]); + proc_debug (thread, "new thread: %lu", threads[i]); ptid = ptid_build (inf->pid, thread->tid, 0); @@ -1345,7 +1352,7 @@ inf_signal (struct inf *inf, enum gdb_signal sig) struct exc_state *e = &w->exc; inf_debug (inf, "passing through exception:" - " task = %d, thread = %d, exc = %d" + " task = %lu, thread = %lu, exc = %d" ", code = %d, subcode = %d", w->thread->port, inf->task->port, e->exception, e->code, e->subcode); @@ -1568,26 +1575,14 @@ rewait: while execing. */ { w->suppress = 1; - inf_debug (inf, "pending_execs = %d, ignoring minor event", - inf->pending_execs); + inf_debug (inf, "pending_execs, ignoring minor event"); } else if (kind == TARGET_WAITKIND_STOPPED && w->status.value.sig == GDB_SIGNAL_TRAP) /* Ah hah! A SIGTRAP from the inferior while starting up probably means we've succesfully completed an exec! */ { - if (--inf->pending_execs == 0) - /* We're done! */ - { -#if 0 /* do we need this? */ - prune_threads (1); /* Get rid of the old shell - threads. */ - renumber_threads (0); /* Give our threads reasonable - names. */ -#endif - } - inf_debug (inf, "pending exec completed, pending_execs => %d", - inf->pending_execs); + inf_debug (inf, "one pending exec completed"); } else if (kind == TARGET_WAITKIND_STOPPED) /* It's possible that this signal is because of a crashed process @@ -1664,7 +1659,7 @@ S_exception_raise_request (mach_port_t port, mach_port_t reply_port, struct proc *thread = inf_port_to_thread (inf, thread_port); inf_debug (waiting_inf, - "thread = %d, task = %d, exc = %d, code = %d, subcode = %d", + "thread = %lu, task = %lu, exc = %d, code = %d, subcode = %d", thread_port, task_port, exception, code, subcode); if (!thread) @@ -1700,13 +1695,13 @@ S_exception_raise_request (mach_port_t port, mach_port_t reply_port, { if (thread->exc_port == port) { - inf_debug (waiting_inf, "Handler is thread exception port <%d>", + inf_debug (waiting_inf, "Handler is thread exception port <%lu>", thread->saved_exc_port); inf->wait.exc.handler = thread->saved_exc_port; } else { - inf_debug (waiting_inf, "Handler is task exception port <%d>", + inf_debug (waiting_inf, "Handler is task exception port <%lu>", inf->task->saved_exc_port); inf->wait.exc.handler = inf->task->saved_exc_port; gdb_assert (inf->task->exc_port == port); @@ -1757,7 +1752,7 @@ do_mach_notify_dead_name (mach_port_t notify, mach_port_t dead_port) { struct inf *inf = waiting_inf; - inf_debug (waiting_inf, "port = %d", dead_port); + inf_debug (waiting_inf, "port = %lu", dead_port); if (inf->task && inf->task->port == dead_port) { @@ -1794,43 +1789,24 @@ do_mach_notify_dead_name (mach_port_t notify, mach_port_t dead_port) } -static error_t -ill_rpc (char *fun) -{ - warning (_("illegal rpc: %s"), fun); - return 0; -} - -error_t -do_mach_notify_no_senders (mach_port_t notify, mach_port_mscount_t count) -{ - return ill_rpc ("do_mach_notify_no_senders"); -} - -error_t -do_mach_notify_port_deleted (mach_port_t notify, mach_port_t name) -{ - return ill_rpc ("do_mach_notify_port_deleted"); -} - -error_t -do_mach_notify_msg_accepted (mach_port_t notify, mach_port_t name) -{ - return ill_rpc ("do_mach_notify_msg_accepted"); -} - -error_t -do_mach_notify_port_destroyed (mach_port_t notify, mach_port_t name) -{ - return ill_rpc ("do_mach_notify_port_destroyed"); -} - -error_t -do_mach_notify_send_once (mach_port_t notify) -{ - return ill_rpc ("do_mach_notify_send_once"); -} +#define ILL_RPC(fun, ...) \ + extern kern_return_t fun (__VA_ARGS__); \ + kern_return_t fun (__VA_ARGS__) \ + { \ + warning (_("illegal rpc: %s"), #fun); \ + return 0; \ + } +ILL_RPC (do_mach_notify_no_senders, + mach_port_t notify, mach_port_mscount_t count) +ILL_RPC (do_mach_notify_port_deleted, + mach_port_t notify, mach_port_t name) +ILL_RPC (do_mach_notify_msg_accepted, + mach_port_t notify, mach_port_t name) +ILL_RPC (do_mach_notify_port_destroyed, + mach_port_t notify, mach_port_t name) +ILL_RPC (do_mach_notify_send_once, + mach_port_t notify) /* Process_reply server routines. We only use process_wait_reply. */ @@ -1887,19 +1863,66 @@ S_proc_wait_reply (mach_port_t reply, error_t err, return 0; } -error_t -S_proc_setmsgport_reply (mach_port_t reply, error_t err, - mach_port_t old_msg_port) -{ - return ill_rpc ("S_proc_setmsgport_reply"); -} - -error_t -S_proc_getmsgport_reply (mach_port_t reply, error_t err, mach_port_t msg_port) -{ - return ill_rpc ("S_proc_getmsgport_reply"); -} - +ILL_RPC (S_proc_setmsgport_reply, + mach_port_t reply_port, kern_return_t return_code, + mach_port_t oldmsgport) +ILL_RPC (S_proc_getmsgport_reply, + mach_port_t reply_port, kern_return_t return_code, + mach_port_t msgports) +ILL_RPC (S_proc_pid2task_reply, + mach_port_t reply_port, kern_return_t return_code, mach_port_t task) +ILL_RPC (S_proc_task2pid_reply, + mach_port_t reply_port, kern_return_t return_code, pid_t pid) +ILL_RPC (S_proc_task2proc_reply, + mach_port_t reply_port, kern_return_t return_code, mach_port_t proc) +ILL_RPC (S_proc_proc2task_reply, + mach_port_t reply_port, kern_return_t return_code, mach_port_t task) +ILL_RPC (S_proc_pid2proc_reply, + mach_port_t reply_port, kern_return_t return_code, mach_port_t proc) +ILL_RPC (S_proc_getprocinfo_reply, + mach_port_t reply_port, kern_return_t return_code, + int flags, procinfo_t procinfo, mach_msg_type_number_t procinfoCnt, + data_t threadwaits, mach_msg_type_number_t threadwaitsCnt) +ILL_RPC (S_proc_getprocargs_reply, + mach_port_t reply_port, kern_return_t return_code, + data_t procargs, mach_msg_type_number_t procargsCnt) +ILL_RPC (S_proc_getprocenv_reply, + mach_port_t reply_port, kern_return_t return_code, + data_t procenv, mach_msg_type_number_t procenvCnt) +ILL_RPC (S_proc_getloginid_reply, + mach_port_t reply_port, kern_return_t return_code, pid_t login_id) +ILL_RPC (S_proc_getloginpids_reply, + mach_port_t reply_port, kern_return_t return_code, + pidarray_t pids, mach_msg_type_number_t pidsCnt) +ILL_RPC (S_proc_getlogin_reply, + mach_port_t reply_port, kern_return_t return_code, string_t logname) +ILL_RPC (S_proc_getsid_reply, + mach_port_t reply_port, kern_return_t return_code, pid_t sid) +ILL_RPC (S_proc_getsessionpgids_reply, + mach_port_t reply_port, kern_return_t return_code, + pidarray_t pgidset, mach_msg_type_number_t pgidsetCnt) +ILL_RPC (S_proc_getsessionpids_reply, + mach_port_t reply_port, kern_return_t return_code, + pidarray_t pidset, mach_msg_type_number_t pidsetCnt) +ILL_RPC (S_proc_getsidport_reply, + mach_port_t reply_port, kern_return_t return_code, + mach_port_t sessport) +ILL_RPC (S_proc_getpgrp_reply, + mach_port_t reply_port, kern_return_t return_code, pid_t pgrp) +ILL_RPC (S_proc_getpgrppids_reply, + mach_port_t reply_port, kern_return_t return_code, + pidarray_t pidset, mach_msg_type_number_t pidsetCnt) +ILL_RPC (S_proc_get_tty_reply, + mach_port_t reply_port, kern_return_t return_code, mach_port_t tty) +ILL_RPC (S_proc_getnports_reply, + mach_port_t reply_port, kern_return_t return_code, + mach_msg_type_number_t nports) +ILL_RPC (S_proc_is_important_reply, + mach_port_t reply_port, kern_return_t return_code, + boolean_t essential) +ILL_RPC (S_proc_get_code_reply, + mach_port_t reply_port, kern_return_t return_code, + vm_address_t start_code, vm_address_t end_code) /* Msg_reply server routines. We only use msg_sig_post_untraced_reply. */ @@ -1933,12 +1956,8 @@ S_msg_sig_post_untraced_reply (mach_port_t reply, error_t err) return 0; } -error_t -S_msg_sig_post_reply (mach_port_t reply, error_t err) -{ - return ill_rpc ("S_msg_sig_post_reply"); -} - +ILL_RPC (S_msg_sig_post_reply, + mach_port_t reply, error_t err) /* Returns the number of messages queued for the receive right PORT. */ static mach_port_msgcount_t @@ -2068,8 +2087,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); } @@ -2123,7 +2141,7 @@ gnu_create_inferior (struct target_ops *ops, push_target (ops); - inf->pending_execs = 2; + inf->pending_execs = 1; inf->nomsg = 1; inf->traced = 1; @@ -2135,7 +2153,8 @@ gnu_create_inferior (struct target_ops *ops, thread_change_ptid (inferior_ptid, ptid_build (inf->pid, inf_pick_first_thread (), 0)); - startup_inferior (inf->pending_execs); + startup_inferior (START_INFERIOR_TRAPS_EXPECTED); + inf->pending_execs = 0; inf_validate_procinfo (inf); inf_update_signal_thread (inf); @@ -2153,7 +2172,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; @@ -2240,18 +2259,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")); } @@ -2276,7 +2295,7 @@ gnu_read_inferior (task_t task, CORE_ADDR addr, gdb_byte *myaddr, int length) vm_size_t aligned_length = (vm_size_t) round_page (addr + length) - low_address; pointer_t copied; - int copy_count; + mach_msg_type_number_t copy_count; /* Get memory from inferior with page aligned addresses. */ err = vm_read (task, low_address, aligned_length, &copied, ©_count); @@ -2323,7 +2342,7 @@ gnu_write_inferior (task_t task, CORE_ADDR addr, vm_size_t aligned_length = (vm_size_t) round_page (addr + length) - low_address; pointer_t copied; - int copy_count; + mach_msg_type_number_t copy_count; int deallocate = 0; char *errstr = "Bug in gnu_write_inferior"; @@ -2380,7 +2399,7 @@ gnu_write_inferior (task_t task, CORE_ADDR addr, /* Check for holes in memory. */ if (old_address != region_address) { - warning (_("No memory at 0x%x. Nothing written"), + warning (_("No memory at 0x%lx. Nothing written"), old_address); err = KERN_SUCCESS; length = 0; @@ -2389,7 +2408,7 @@ gnu_write_inferior (task_t task, CORE_ADDR addr, if (!(max_protection & VM_PROT_WRITE)) { - warning (_("Memory at address 0x%x is unwritable. " + warning (_("Memory at address 0x%lx is unwritable. " "Nothing written"), old_address); err = KERN_SUCCESS; @@ -2532,7 +2551,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; @@ -2651,10 +2671,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; @@ -2662,7 +2678,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; @@ -2894,7 +2910,7 @@ steal_exc_port (struct proc *proc, mach_port_t name) name, MACH_MSG_TYPE_COPY_SEND, &port, &port_type); if (err) - error (_("Couldn't extract send right %d from inferior: %s"), + error (_("Couldn't extract send right %lu from inferior: %s"), name, safe_strerror (err)); if (proc->saved_exc_port)