diff options
Diffstat (limited to 'gdb/inftarg.c')
| -rw-r--r-- | gdb/inftarg.c | 683 |
1 files changed, 608 insertions, 75 deletions
diff --git a/gdb/inftarg.c b/gdb/inftarg.c index 95f6c3a..921cbbe 100644 --- a/gdb/inftarg.c +++ b/gdb/inftarg.c @@ -3,6 +3,8 @@ Free Software Foundation, Inc. Contributed by Cygnus Support. +## Contains temporary hacks.. + This file is part of GDB. This program is free software; you can redistribute it and/or modify @@ -25,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "target.h" #include "gdbcore.h" #include "command.h" +#include "gdb_stat.h" #include <signal.h> #include <sys/types.h> #include <fcntl.h> @@ -39,6 +42,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* "wait.h" fills in the gaps left by <wait.h> */ #include "wait.h" +#include <sys/unistd.h> + +extern struct symtab_and_line * +child_enable_exception_callback PARAMS ((enum exception_event_kind, int)); + +extern struct exception_event_record * +child_get_current_exception_event PARAMS ((void)); static void child_prepare_to_store PARAMS ((void)); @@ -47,6 +57,11 @@ child_prepare_to_store PARAMS ((void)); static int child_wait PARAMS ((int, struct target_waitstatus *)); #endif /* CHILD_WAIT */ +#if !defined(CHILD_POST_WAIT) +void +child_post_wait PARAMS ((int, int)); +#endif + static void child_open PARAMS ((char *, int)); static void @@ -56,15 +71,33 @@ static void child_detach PARAMS ((char *, int)); static void +child_detach_from_process PARAMS ((int, char *, int, int)); + +static void child_attach PARAMS ((char *, int)); static void +child_attach_to_process PARAMS ((char *, int, int)); + +#if !defined(CHILD_POST_ATTACH) +static void +child_post_attach PARAMS ((int)); +#endif + +static void +child_require_attach PARAMS ((char *, int)); + +static void +child_require_detach PARAMS ((int, char *, int)); + +static void ptrace_me PARAMS ((void)); -static int +static void ptrace_him PARAMS ((int)); -static void child_create_inferior PARAMS ((char *, char *, char **)); +static void +child_create_inferior PARAMS ((char *, char *, char **)); static void child_mourn_inferior PARAMS ((void)); @@ -72,14 +105,11 @@ child_mourn_inferior PARAMS ((void)); static int child_can_run PARAMS ((void)); -static int -proc_wait PARAMS ((int, int*)); - static void child_stop PARAMS ((void)); #ifndef CHILD_THREAD_ALIVE -static int child_thread_alive PARAMS ((int)); +int child_thread_alive PARAMS ((int)); #endif extern char **environ; @@ -91,18 +121,19 @@ int child_suppress_run = 0; /* Non-zero if inftarg should pretend not to be a runnable target. Used by targets that can sit atop inftarg, such as HPUX thread support. */ -static int -proc_wait (pid, status) - int pid; - int *status; -{ -#ifndef __GO32__ - return wait (status); -#endif -} #ifndef CHILD_WAIT +/*##*/ +/* Enable HACK for ttrace work. In + * infttrace.c/require_notification_of_events, + * this is set to 0 so that the loop in child_wait + * won't loop. + */ +int not_same_real_pid = 1; +/*##*/ + + /* Wait for child to do something. Return pid of child, or -1 in case of error; store status through argument pointer OURSTATUS. */ @@ -113,6 +144,11 @@ child_wait (pid, ourstatus) { int save_errno; int status; + char * execd_pathname; + int exit_status; + int related_pid; + int syscall_id; + enum target_waitkind kind; do { set_sigint_trap(); /* Causes SIGINT to be passed on to the @@ -120,6 +156,7 @@ child_wait (pid, ourstatus) set_sigio_trap (); pid = proc_wait (inferior_pid, &status); + save_errno = errno; clear_sigio_trap (); @@ -130,19 +167,98 @@ child_wait (pid, ourstatus) { if (save_errno == EINTR) continue; + fprintf_unfiltered (gdb_stderr, "Child process unexpectedly missing: %s.\n", safe_strerror (save_errno)); + /* Claim it exited with unknown signal. */ ourstatus->kind = TARGET_WAITKIND_SIGNALLED; ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN; return -1; } - } while (pid != inferior_pid); /* Some other child died or stopped */ + + /* Did it exit? + */ + if (target_has_exited (pid, status, &exit_status)) + { + /* ??rehrauer: For now, ignore this. */ + continue; + } + + if (!target_thread_alive (pid)) + { + ourstatus->kind = TARGET_WAITKIND_SPURIOUS; + return pid; + } + + if (target_has_forked (pid, &related_pid) + && (pid == inferior_pid) || (related_pid == inferior_pid)) + { + ourstatus->kind = TARGET_WAITKIND_FORKED; + ourstatus->value.related_pid = related_pid; + return pid; + } + + if (target_has_vforked (pid, &related_pid) + && (pid == inferior_pid) || (related_pid == inferior_pid)) + { + ourstatus->kind = TARGET_WAITKIND_VFORKED; + ourstatus->value.related_pid = related_pid; + return pid; + } + + if (target_has_execd (pid, &execd_pathname)) + { + /* Are we ignoring initial exec events? (This is likely because + we're in the process of starting up the inferior, and another + (older) mechanism handles those.) If so, we'll report this + as a regular stop, not an exec. + */ + if (inferior_ignoring_startup_exec_events) + { + inferior_ignoring_startup_exec_events--; + } + else + { + ourstatus->kind = TARGET_WAITKIND_EXECD; + ourstatus->value.execd_pathname = execd_pathname; + return pid; + } + } + + /* All we must do with these is communicate their occurrence + to wait_for_inferior... + */ + if (target_has_syscall_event (pid, &kind, &syscall_id)) + { + ourstatus->kind = kind; + ourstatus->value.syscall_id = syscall_id; + return pid; + } + +/*## } while (pid != inferior_pid); ##*/ /* Some other child died or stopped */ +/* hack for thread testing */ + } while( (pid != inferior_pid) && not_same_real_pid ); +/*##*/ + store_waitstatus (ourstatus, status); return pid; } #endif /* CHILD_WAIT */ +#if !defined(CHILD_POST_WAIT) +void +child_post_wait (pid, wait_status) + int pid; + int wait_status; +{ + /* This version of Unix doesn't require a meaningful "post wait" + operation. + */ +} +#endif + + #ifndef CHILD_THREAD_ALIVE /* Check to see if the given thread is alive. @@ -150,7 +266,7 @@ child_wait (pid, ourstatus) FIXME: Is kill() ever the right way to do this? I doubt it, but for now we're going to try and be compatable with the old thread code. */ -static int +int child_thread_alive (pid) int pid; { @@ -159,12 +275,11 @@ child_thread_alive (pid) #endif -/* Attach to process PID, then initialize for debugging it. */ - static void -child_attach (args, from_tty) - char *args; - int from_tty; +child_attach_to_process (args, from_tty, after_fork) + char * args; + int from_tty; + int after_fork; { if (!args) error_no_arg ("process-id to attach"); @@ -175,8 +290,14 @@ child_attach (args, from_tty) { char *exec_file; int pid; + struct target_waitstatus *wstatus; + char * dummy; - pid = atoi (args); + dummy = args; + pid = strtol (args, &dummy, 0); + /* Some targets don't set errno on errors, grrr! */ + if ((pid == 0) && (args == dummy)) + error ("Illegal process-id: %s\n", args); if (pid == getpid()) /* Trying to masturbate? */ error ("I refuse to debug myself!"); @@ -185,16 +306,23 @@ child_attach (args, from_tty) { exec_file = (char *) get_exec_file (0); - if (exec_file) - printf_unfiltered ("Attaching to program `%s', %s\n", exec_file, + if (after_fork) + printf_unfiltered ("Attaching after fork to %s\n", target_pid_to_str (pid)); - else - printf_unfiltered ("Attaching to %s\n", target_pid_to_str (pid)); + else if (exec_file) + printf_unfiltered ("Attaching to program: %s, %s\n", exec_file, + target_pid_to_str (pid)); + else + printf_unfiltered ("Attaching to %s\n", target_pid_to_str (pid)); gdb_flush (gdb_stdout); } - attach (pid); + if (!after_fork) + attach (pid); + else + REQUIRE_ATTACH (pid); + inferior_pid = pid; push_target (&child_ops); } @@ -202,19 +330,43 @@ child_attach (args, from_tty) } -/* Take a program previously attached to and detaches it. - The program resumes execution and will no longer stop - on signals, etc. We'd better not have left any breakpoints - in the program or it'll die when it hits one. For this - to work, it may be necessary for the process to have been - previously attached. It *might* work if the program was - started via the normal ptrace (PTRACE_TRACEME). */ +/* Attach to process PID, then initialize for debugging it. */ static void -child_detach (args, from_tty) +child_attach (args, from_tty) + char *args; + int from_tty; +{ + child_attach_to_process (args, from_tty, 0); +} + +#if !defined(CHILD_POST_ATTACH) +static void +child_post_attach (pid) + int pid; +{ + /* This version of Unix doesn't require a meaningful "post attach" + operation by a debugger. + */ +} +#endif + + +static void +child_require_attach (args, from_tty) char *args; int from_tty; { + child_attach_to_process (args, from_tty, 1); +} + +static void +child_detach_from_process (pid, args, from_tty, after_fork) + int pid; + char * args; + int from_tty; + int after_fork; +{ #ifdef ATTACH_DETACH { int siggnal = 0; @@ -224,22 +376,55 @@ child_detach (args, from_tty) char *exec_file = get_exec_file (0); if (exec_file == 0) exec_file = ""; - printf_unfiltered ("Detaching from program: %s %s\n", exec_file, - target_pid_to_str (inferior_pid)); + if (after_fork) + printf_unfiltered ("Detaching after fork from %s\n", + target_pid_to_str (pid)); + else + printf_unfiltered ("Detaching from program: %s, %s\n", exec_file, + target_pid_to_str (pid)); gdb_flush (gdb_stdout); } if (args) siggnal = atoi (args); - detach (siggnal); - inferior_pid = 0; - unpush_target (&child_ops); + if (!after_fork) + detach (siggnal); + else + REQUIRE_DETACH (pid, siggnal); } #else error ("This version of Unix does not support detaching a process."); #endif } +/* Take a program previously attached to and detaches it. + The program resumes execution and will no longer stop + on signals, etc. We'd better not have left any breakpoints + in the program or it'll die when it hits one. For this + to work, it may be necessary for the process to have been + previously attached. It *might* work if the program was + started via the normal ptrace (PTRACE_TRACEME). */ + +static void +child_detach (args, from_tty) + char *args; + int from_tty; +{ + child_detach_from_process (inferior_pid, args, from_tty, 0); + inferior_pid = 0; + unpush_target (&child_ops); +} + +static void +child_require_detach (pid, args, from_tty) + int pid; + char * args; + int from_tty; +{ + child_detach_from_process (pid, args, from_tty, 1); +} + + /* Get ready to modify the registers array. On machines which store individual registers, this doesn't need to do anything. On machines which store all the registers in one fell swoop, this makes sure @@ -286,20 +471,30 @@ ptrace_me () /* Stub function which causes the GDB that runs it, to start ptrace-ing the child process. */ -static int +static void ptrace_him (pid) int pid; { push_target (&child_ops); -#ifdef START_INFERIOR_TRAPS_EXPECTED + /* On some targets, there must be some explicit synchronization + between the parent and child processes after the debugger + forks, and before the child execs the debuggee program. This + call basically gives permission for the child to exec. + */ + + target_acknowledge_created_inferior (pid); + + /* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h, + * and will be 1 or 2 depending on whether we're starting + * without or with a shell. + */ startup_inferior (START_INFERIOR_TRAPS_EXPECTED); -#else - /* One trap to exec the shell, one to exec the program being debugged. */ - startup_inferior (2); -#endif - return pid; + /* On some targets, there must be some explicit actions taken after + the inferior has been started up. + */ + target_post_startup_inferior (pid); } /* Start an inferior Unix child process and sets inferior_pid to its pid. @@ -313,12 +508,307 @@ child_create_inferior (exec_file, allargs, env) char *allargs; char **env; { - fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, NULL); + +#ifdef HPUXHPPA + char *tryname; + char *shell_file; + char *p; + char *p1; + char *path = getenv ("PATH"); + int len; + struct stat statbuf; + + /* On HP-UX, we have a possible bad interaction between + * the start-up-with-shell code and our catch-fork/catch-exec + * logic. To avoid the bad interaction, we start up with the + * C shell ("csh") and pass it the "-f" flag (fast start-up, + * don't run .cshrc code). + * See further comments in inferior.h toward the bottom + * (STARTUP_WITH_SHELL flag) and in fork-child.c + */ + + /* Rather than passing in a hard-wired path like "/bin/csh", + * we look down the PATH to find csh. I took this code from + * procfs.c, which is the file in the Sun-specific part of GDB + * analogous to inftarg.c. See procfs.c for more detailed + * comments. - RT + */ + shell_file = "csh"; + if (path == NULL) + path = "/bin:/usr/bin"; + tryname = alloca (strlen (path) + strlen (shell_file) + 2); + for (p = path; p != NULL; p = p1 ? p1 + 1: NULL) + { + p1 = strchr (p, ':'); + if (p1 != NULL) + len = p1 - p; + else + len = strlen (p); + strncpy (tryname, p, len); + tryname[len] = '\0'; + strcat (tryname, "/"); + strcat (tryname, shell_file); + if (access (tryname, X_OK) < 0) + continue; + if (stat (tryname, &statbuf) < 0) + continue; + if (!S_ISREG (statbuf.st_mode)) + /* We certainly need to reject directories. I'm not quite + as sure about FIFOs, sockets, etc., but I kind of doubt + that people want to exec() these things. */ + continue; + break; + } + if (p == NULL) + /* Not found. I replaced the error() which existed in procfs.c + * with simply passing in NULL and hoping fork_inferior() + * can deal with it. - RT + */ + /* error ("Can't find shell %s in PATH", shell_file); */ + shell_file = NULL; + else + shell_file = tryname; + + fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, pre_fork_inferior, shell_file); +#else + fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, NULL, NULL); +#endif /* We are at the first instruction we care about. */ /* Pedal to the metal... */ proceed ((CORE_ADDR) -1, TARGET_SIGNAL_0, 0); } +#if !defined(CHILD_POST_STARTUP_INFERIOR) +void +child_post_startup_inferior (pid) + int pid; +{ + /* This version of Unix doesn't require a meaningful "post startup inferior" + operation by a debugger. + */ +} +#endif + +#if !defined(CHILD_ACKNOWLEDGE_CREATED_INFERIOR) +void +child_acknowledge_created_inferior (pid) + int pid; +{ + /* This version of Unix doesn't require a meaningful "acknowledge created inferior" + operation by a debugger. + */ +} +#endif + + +void +child_clone_and_follow_inferior (child_pid, followed_child) + int child_pid; + int *followed_child; +{ + clone_and_follow_inferior (child_pid, followed_child); + + /* Don't resume CHILD_PID; it's stopped where it ought to be, until + the decision gets made elsewhere how to continue it. + */ +} + + +#if !defined(CHILD_POST_FOLLOW_INFERIOR_BY_CLONE) +void +child_post_follow_inferior_by_clone () +{ + /* This version of Unix doesn't require a meaningful "post follow inferior" + operation by a clone debugger. + */ +} +#endif + + +#if !defined(CHILD_INSERT_FORK_CATCHPOINT) +int +child_insert_fork_catchpoint (pid) + int pid; +{ + /* This version of Unix doesn't support notification of fork events. + */ +} +#endif + + +#if !defined(CHILD_REMOVE_FORK_CATCHPOINT) +int +child_remove_fork_catchpoint (pid) + int pid; +{ + /* This version of Unix doesn't support notification of fork events. + */ +} +#endif + + +#if !defined(CHILD_INSERT_VFORK_CATCHPOINT) +int +child_insert_vfork_catchpoint (pid) + int pid; +{ + /* This version of Unix doesn't support notification of vfork events. + */ +} +#endif + + +#if !defined(CHILD_REMOVE_VFORK_CATCHPOINT) +int +child_remove_vfork_catchpoint (pid) + int pid; +{ + /* This version of Unix doesn't support notification of vfork events. + */ +} +#endif + + +#if !defined(CHILD_HAS_FORKED) +int +child_has_forked (pid, child_pid) + int pid; + int * child_pid; +{ + /* This version of Unix doesn't support notification of fork events. + */ + return 0; +} +#endif + + +#if !defined(CHILD_HAS_VFORKED) +int +child_has_vforked (pid, child_pid) + int pid; + int * child_pid; +{ + /* This version of Unix doesn't support notification of vfork events. + */ + return 0; +} +#endif + + +#if !defined(CHILD_CAN_FOLLOW_VFORK_PRIOR_TO_EXEC) +int +child_can_follow_vfork_prior_to_exec () +{ + /* This version of Unix doesn't support notification of vfork events. + However, if it did, it probably wouldn't allow vforks to be followed + before the following exec. + */ + return 0; +} +#endif + + +#if !defined(CHILD_POST_FOLLOW_VFORK) +void +child_post_follow_vfork (parent_pid, followed_parent, child_pid, followed_child) + int parent_pid; + int followed_parent; + int child_pid; + int followed_child; +{ + /* This version of Unix doesn't require a meaningful "post follow vfork" + operation by a clone debugger. + */ +} +#endif + +#if !defined(CHILD_INSERT_EXEC_CATCHPOINT) +int +child_insert_exec_catchpoint (pid) + int pid; +{ + /* This version of Unix doesn't support notification of exec events. + */ +} +#endif + + +#if !defined(CHILD_REMOVE_EXEC_CATCHPOINT) +int +child_remove_exec_catchpoint (pid) + int pid; +{ + /* This version of Unix doesn't support notification of exec events. + */ +} +#endif + + +#if !defined(CHILD_HAS_EXECD) +int +child_has_execd (pid, execd_pathname) + int pid; + char ** execd_pathname; +{ + /* This version of Unix doesn't support notification of exec events. + */ + return 0; +} +#endif + + +#if !defined(CHILD_REPORTED_EXEC_EVENTS_PER_EXEC_CALL) +int +child_reported_exec_events_per_exec_call () +{ + /* This version of Unix doesn't support notification of exec events. + */ + return 1; +} +#endif + + +#if !defined(CHILD_HAS_SYSCALL_EVENT) +int +child_has_syscall_event (pid, kind, syscall_id) + int pid; + enum target_waitkind * kind; + int * syscall_id; +{ + /* This version of Unix doesn't support notification of syscall events. + */ + return 0; +} +#endif + + +#if !defined(CHILD_HAS_EXITED) +int +child_has_exited (pid, wait_status, exit_status) + int pid; + int wait_status; + int * exit_status; +{ + if (WIFEXITED (wait_status)) + { + *exit_status = WEXITSTATUS (wait_status); + return 1; + } + + if (WIFSIGNALED (wait_status)) + { + *exit_status = 0; /* ?? Don't know what else to say here. */ + return 1; + } + + /* ?? Do we really need to consult the event state, too? Assume the + wait_state alone suffices. + */ + return 0; +} +#endif + + static void child_mourn_inferior () { @@ -353,6 +843,49 @@ child_stop () kill (-inferior_process_group, SIGINT); } + +#if !defined(CHILD_ENABLE_EXCEPTION_CALLBACK) +struct symtab_and_line * +child_enable_exception_callback (kind, enable) + enum exception_event_kind kind; + int enable; +{ + return (struct symtab_and_line *) NULL; +} +#endif + +#if !defined(CHILD_GET_CURRENT_EXCEPTION_EVENT) +struct exception_event_record * +child_get_current_exception_event () +{ + return (struct exception_event_record *) NULL; +} +#endif + + +#if !defined(CHILD_PID_TO_EXEC_FILE) +char * +child_pid_to_exec_file (pid) + int pid; +{ + /* This version of Unix doesn't support translation of a process ID + to the filename of the executable file. + */ + return NULL; +} +#endif + +char * +child_core_file_to_sym_file (core) + char * core; +{ + /* The target stratum for a running executable need not support + this operation. + */ + return NULL; +} + + struct target_ops child_ops = { "child", /* to_shortname */ @@ -361,13 +894,13 @@ struct target_ops child_ops = { child_open, /* to_open */ 0, /* to_close */ child_attach, /* to_attach */ - NULL, /* to_post_attach */ - NULL, /* to_require_attach */ + child_post_attach, /* to_post_attach */ + child_require_attach, /* to_require_attach */ child_detach, /* to_detach */ - NULL, /* to_require_detach */ + child_require_detach, /* to_require_detach */ child_resume, /* to_resume */ child_wait, /* to_wait */ - NULL, /* to_post_wait */ + child_post_wait, /* to_post_wait */ fetch_inferior_registers, /* to_fetch_registers */ store_inferior_registers, /* to_store_registers */ child_prepare_to_store, /* to_prepare_to_store */ @@ -384,33 +917,33 @@ struct target_ops child_ops = { 0, /* to_load */ 0, /* to_lookup_symbol */ child_create_inferior, /* to_create_inferior */ - NULL, /* to_post_startup_inferior */ - NULL, /* to_acknowledge_created_inferior */ - NULL, /* to_clone_and_follow_inferior */ - NULL, /* to_post_follow_inferior_by_clone */ - NULL, /* to_insert_fork_catchpoint */ - NULL, /* to_remove_fork_catchpoint */ - NULL, /* to_insert_vfork_catchpoint */ - NULL, /* to_remove_vfork_catchpoint */ - NULL, /* to_has_forked */ - NULL, /* to_has_vforked */ - NULL, /* to_can_follow_vfork_prior_to_exec */ - NULL, /* to_post_follow_vfork */ - NULL, /* to_insert_exec_catchpoint */ - NULL, /* to_remove_exec_catchpoint */ - NULL, /* to_has_execd */ - NULL, /* to_reported_exec_events_per_exec_call */ - NULL, /* to_has_syscall_event */ - NULL, /* to_has_exited */ + child_post_startup_inferior, /* to_post_startup_inferior */ + child_acknowledge_created_inferior, /* to_acknowledge_created_inferior */ + child_clone_and_follow_inferior, /* to_clone_and_follow_inferior */ + child_post_follow_inferior_by_clone, /* to_post_follow_inferior_by_clone */ + child_insert_fork_catchpoint, /* to_insert_fork_catchpoint */ + child_remove_fork_catchpoint, /* to_remove_fork_catchpoint */ + child_insert_vfork_catchpoint, /* to_insert_vfork_catchpoint */ + child_remove_vfork_catchpoint, /* to_remove_vfork_catchpoint */ + child_has_forked, /* to_has_forked */ + child_has_vforked, /* to_has_vforked */ + child_can_follow_vfork_prior_to_exec, /* to_can_follow_vfork_prior_to_exec */ + child_post_follow_vfork, /* to_post_follow_vfork */ + child_insert_exec_catchpoint, /* to_insert_exec_catchpoint */ + child_remove_exec_catchpoint, /* to_remove_exec_catchpoint */ + child_has_execd, /* to_has_execd */ + child_reported_exec_events_per_exec_call, /* to_reported_exec_events_per_exec_call */ + child_has_syscall_event, /* to_has_syscall_event */ + child_has_exited, /* to_has_exited */ child_mourn_inferior, /* to_mourn_inferior */ child_can_run, /* to_can_run */ 0, /* to_notice_signals */ child_thread_alive, /* to_thread_alive */ child_stop, /* to_stop */ - NULL, /* to_enable_exception_callback */ - NULL, /* to_get_current_exception_event */ - NULL, /* to_pid_to_exec_file */ - NULL, /* to_core_file_to_sym_file */ + child_enable_exception_callback, /* to_enable_exception_callback */ + child_get_current_exception_event, /* to_get_current_exception_event */ + child_pid_to_exec_file, /* to_pid_to_exec_file */ + child_core_file_to_sym_file, /* to_core_file_to_sym_file */ process_stratum, /* to_stratum */ 0, /* to_next */ 1, /* to_has_all_memory */ |