gdb/

[deliverable/binutils-gdb.git] / gdb / inferior.h

diff --git a/gdb/inferior.h b/gdb/inferior.h
index 4571893df818e5e075dc61d69c2ab86254b631b6..7cebcbf6bfa10337a47d7b4a06a6b53094914cf7 100644 (file)
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -2,8 +2,8 @@
    Where it is, why it stopped, and how to step it.
 
    Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
    Where it is, why it stopped, and how to step it.
 
    Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,

-   1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+   2011 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -43,43 +43,31 @@ struct terminal_info;
 
 #include "progspace.h"
 
 
 #include "progspace.h"
 

-/* Two structures are used to record inferior state.
+struct infcall_suspend_state;
+struct infcall_control_state;

 
 

-   inferior_thread_state contains state about the program itself like its
-   registers and any signal it received when it last stopped.
-   This state must be restored regardless of how the inferior function call
-   ends (either successfully, or after it hits a breakpoint or signal)
-   if the program is to properly continue where it left off.
+extern struct infcall_suspend_state *save_infcall_suspend_state (void);
+extern struct infcall_control_state *save_infcall_control_state (void);

 
 

-   inferior_status contains state regarding gdb's control of the inferior
-   itself like stepping control.  It also contains session state like the
-   user's currently selected frame.
+extern void restore_infcall_suspend_state (struct infcall_suspend_state *);
+extern void restore_infcall_control_state (struct infcall_control_state *);

 
 

-   Call these routines around hand called functions, including function calls
-   in conditional breakpoints for example.  */
+extern struct cleanup *make_cleanup_restore_infcall_suspend_state
+                                           (struct infcall_suspend_state *);
+extern struct cleanup *make_cleanup_restore_infcall_control_state
+                                           (struct infcall_control_state *);

 
 

-struct inferior_thread_state;
-struct inferior_status;
+extern void discard_infcall_suspend_state (struct infcall_suspend_state *);
+extern void discard_infcall_control_state (struct infcall_control_state *);

 
 

-extern struct inferior_thread_state *save_inferior_thread_state (void);
-extern struct inferior_status *save_inferior_status (void);
-
-extern void restore_inferior_thread_state (struct inferior_thread_state *);
-extern void restore_inferior_status (struct inferior_status *);
-
-extern struct cleanup *make_cleanup_restore_inferior_thread_state (struct inferior_thread_state *);
-extern struct cleanup *make_cleanup_restore_inferior_status (struct inferior_status *);
-
-extern void discard_inferior_thread_state (struct inferior_thread_state *);
-extern void discard_inferior_status (struct inferior_status *);
-
-extern struct regcache *get_inferior_thread_state_regcache (struct inferior_thread_state *);
+extern struct regcache *
+  get_infcall_suspend_state_regcache (struct infcall_suspend_state *);

 
 /* The -1 ptid, often used to indicate either an error condition
    or a "don't care" condition, i.e, "run all threads."  */
 extern ptid_t minus_one_ptid;
 
 
 /* The -1 ptid, often used to indicate either an error condition
    or a "don't care" condition, i.e, "run all threads."  */
 extern ptid_t minus_one_ptid;
 

-/* The null or zero ptid, often used to indicate no process. */
+/* The null or zero ptid, often used to indicate no process.  */

 extern ptid_t null_ptid;
 
 /* Attempt to find and return an existing ptid with the given PID, LWP,
 extern ptid_t null_ptid;
 
 /* Attempt to find and return an existing ptid with the given PID, LWP,


@@ -87,24 +75,34 @@ extern ptid_t null_ptid;
    that.  */
 ptid_t ptid_build (int pid, long lwp, long tid);
 
    that.  */
 ptid_t ptid_build (int pid, long lwp, long tid);
 

-/* Find/Create a ptid from just a pid. */
+/* Find/Create a ptid from just a pid.  */

 ptid_t pid_to_ptid (int pid);
 
 ptid_t pid_to_ptid (int pid);
 

-/* Fetch the pid (process id) component from a ptid. */
+/* Fetch the pid (process id) component from a ptid.  */

 int ptid_get_pid (ptid_t ptid);
 
 int ptid_get_pid (ptid_t ptid);
 

-/* Fetch the lwp (lightweight process) component from a ptid. */
+/* Fetch the lwp (lightweight process) component from a ptid.  */

 long ptid_get_lwp (ptid_t ptid);
 
 long ptid_get_lwp (ptid_t ptid);
 

-/* Fetch the tid (thread id) component from a ptid. */
+/* Fetch the tid (thread id) component from a ptid.  */

 long ptid_get_tid (ptid_t ptid);
 
 long ptid_get_tid (ptid_t ptid);
 

-/* Compare two ptids to see if they are equal */
+/* Compare two ptids to see if they are equal.  */

 extern int ptid_equal (ptid_t p1, ptid_t p2);
 
 /* Return true if PTID represents a process id.  */
 extern int ptid_is_pid (ptid_t ptid);
 
 extern int ptid_equal (ptid_t p1, ptid_t p2);
 
 /* Return true if PTID represents a process id.  */
 extern int ptid_is_pid (ptid_t ptid);
 

+/* Returns true if PTID matches filter FILTER.  FILTER can be the wild
+   card MINUS_ONE_PTID (all ptid match it); can be a ptid representing
+   a process (ptid_is_pid returns true), in which case, all lwps and
+   threads of that given process match, lwps and threads of other
+   processes do not; or, it can represent a specific thread, in which
+   case, only that thread will match true.  PTID must represent a
+   specific LWP or THREAD, it can never be a wild card.  */
+
+extern int ptid_match (ptid_t ptid, ptid_t filter);
+

 /* Save value of inferior_ptid so that it may be restored by
    a later call to do_cleanups().  Returns the struct cleanup
    pointer needed for later doing the cleanup.  */
 /* Save value of inferior_ptid so that it may be restored by
    a later call to do_cleanups().  Returns the struct cleanup
    pointer needed for later doing the cleanup.  */


@@ -120,16 +118,16 @@ extern void set_inferior_io_terminal (const char *terminal_name);
 extern const char *get_inferior_io_terminal (void);
 
 /* Collected pid, tid, etc. of the debugged inferior.  When there's
 extern const char *get_inferior_io_terminal (void);
 
 /* Collected pid, tid, etc. of the debugged inferior.  When there's

-   no inferior, PIDGET (inferior_ptid) will be 0. */
+   no inferior, PIDGET (inferior_ptid) will be 0.  */

 
 extern ptid_t inferior_ptid;
 
 /* Are we simulating synchronous execution? This is used in async gdb
    to implement the 'run', 'continue' etc commands, which will not
 
 extern ptid_t inferior_ptid;
 
 /* Are we simulating synchronous execution? This is used in async gdb
    to implement the 'run', 'continue' etc commands, which will not

-   redisplay the prompt until the execution is actually over. */
+   redisplay the prompt until the execution is actually over.  */

 extern int sync_execution;
 
 extern int sync_execution;
 

-/* Inferior environment. */
+/* Inferior environment.  */

 
 extern void clear_proceed_status (void);
 
 
 extern void clear_proceed_status (void);
 


@@ -175,6 +173,8 @@ extern void address_to_signed_pointer (struct gdbarch *gdbarch,
 
 extern void wait_for_inferior (int treat_exec_as_sigtrap);
 
 
 extern void wait_for_inferior (int treat_exec_as_sigtrap);
 

+extern void prepare_for_detach (void);
+

 extern void fetch_inferior_event (void *);
 
 extern void init_wait_for_inferior (void);
 extern void fetch_inferior_event (void *);
 
 extern void init_wait_for_inferior (void);


@@ -220,6 +220,10 @@ extern char *construct_inferior_arguments (int, char **);
 
 /* From infrun.c */
 
 
 /* From infrun.c */
 

+extern int debug_infrun;
+
+extern int stop_on_solib_events;
+

 extern void start_remote (int from_tty);
 
 extern void normal_stop (void);
 extern void start_remote (int from_tty);
 
 extern void normal_stop (void);


@@ -275,6 +279,8 @@ extern void interrupt_target_command (char *args, int from_tty);
 
 extern void interrupt_target_1 (int all_threads);
 
 
 extern void interrupt_target_1 (int all_threads);
 

+extern void delete_longjmp_breakpoint_cleanup (void *arg);
+

 extern void detach_command (char *, int);
 
 extern void notice_new_inferior (ptid_t, int, int);
 extern void detach_command (char *, int);
 
 extern void notice_new_inferior (ptid_t, int, int);


@@ -285,7 +291,7 @@ extern CORE_ADDR stop_pc;
 
 /* Nonzero if stopped due to completion of a stack dummy routine.  */
 
 
 /* Nonzero if stopped due to completion of a stack dummy routine.  */
 

-extern int stop_stack_dummy;
+extern enum stop_stack_kind stop_stack_dummy;

 
 /* Nonzero if program stopped due to a random (unexpected) signal in
    inferior process.  */
 
 /* Nonzero if program stopped due to a random (unexpected) signal in
    inferior process.  */


@@ -310,10 +316,10 @@ enum step_over_calls_kind
    setting up a remote connection; it is like STOP_QUIETLY_NO_SIGSTOP
    except that there is no need to hide a signal.  */
 
    setting up a remote connection; it is like STOP_QUIETLY_NO_SIGSTOP
    except that there is no need to hide a signal.  */
 

-/* It is also used after attach, due to attaching to a process. This
+/* It is also used after attach, due to attaching to a process.  This

    is a bit trickier.  When doing an attach, the kernel stops the
    debuggee with a SIGSTOP.  On newer GNU/Linux kernels (>= 2.5.61)
    is a bit trickier.  When doing an attach, the kernel stops the
    debuggee with a SIGSTOP.  On newer GNU/Linux kernels (>= 2.5.61)

-   the handling of SIGSTOP for a ptraced process has changed. Earlier
+   the handling of SIGSTOP for a ptraced process has changed.  Earlier

    versions of the kernel would ignore these SIGSTOPs, while now
    SIGSTOP is treated like any other signal, i.e. it is not muffled.
    
    versions of the kernel would ignore these SIGSTOPs, while now
    SIGSTOP is treated like any other signal, i.e. it is not muffled.
    


@@ -321,7 +327,7 @@ enum step_over_calls_kind
    the global variable stop_signal (which stores the signal from the
    attach, SIGSTOP) to the ptrace(PTRACE_CONT,...)  call.  This is
    problematic, because the kernel doesn't ignore such SIGSTOP
    the global variable stop_signal (which stores the signal from the
    attach, SIGSTOP) to the ptrace(PTRACE_CONT,...)  call.  This is
    problematic, because the kernel doesn't ignore such SIGSTOP

-   now. I.e. it is reported back to gdb, which in turn presents it
+   now.  I.e. it is reported back to gdb, which in turn presents it

    back to the user.
  
    To avoid the problem, we use STOP_QUIETLY_NO_SIGSTOP, which allows
    back to the user.
  
    To avoid the problem, we use STOP_QUIETLY_NO_SIGSTOP, which allows


@@ -368,7 +374,7 @@ void displaced_step_dump_bytes (struct ui_file *file,
 
 /* If STARTUP_WITH_SHELL is set, GDB's "run"
    will attempts to start up the debugee under a shell.
 
 /* If STARTUP_WITH_SHELL is set, GDB's "run"
    will attempts to start up the debugee under a shell.

-   This is in order for argument-expansion to occur. E.g.,
+   This is in order for argument-expansion to occur.  E.g.,

    (gdb) run *
    The "*" gets expanded by the shell into a list of files.
    While this is a nice feature, it turns out to interact badly
    (gdb) run *
    The "*" gets expanded by the shell into a list of files.
    While this is a nice feature, it turns out to interact badly


@@ -381,7 +387,7 @@ void displaced_step_dump_bytes (struct ui_file *file,
    be 1 if target is not started up with a shell, 2 if it is.
    - RT
    If you disable this, you need to decrement
    be 1 if target is not started up with a shell, 2 if it is.
    - RT
    If you disable this, you need to decrement

-   START_INFERIOR_TRAPS_EXPECTED in tm.h. */
+   START_INFERIOR_TRAPS_EXPECTED in tm.h.  */

 #define STARTUP_WITH_SHELL 1
 #if !defined(START_INFERIOR_TRAPS_EXPECTED)
 #define START_INFERIOR_TRAPS_EXPECTED  2
 #define STARTUP_WITH_SHELL 1
 #if !defined(START_INFERIOR_TRAPS_EXPECTED)
 #define START_INFERIOR_TRAPS_EXPECTED  2


@@ -389,6 +395,24 @@ void displaced_step_dump_bytes (struct ui_file *file,
 
 struct private_inferior;
 
 
 struct private_inferior;
 

+/* Inferior process specific part of `struct infcall_control_state'.
+
+   Inferior thread counterpart is `struct thread_control_state'.  */
+
+struct inferior_control_state
+{
+  /* See the definition of stop_kind above.  */
+  enum stop_kind stop_soon;
+};
+
+/* Inferior process specific part of `struct infcall_suspend_state'.
+
+   Inferior thread counterpart is `struct thread_suspend_state'.  */
+
+struct inferior_suspend_state
+{
+};
+

 /* GDB represents the state of each program execution with an object
    called an inferior.  An inferior typically corresponds to a process
    but is more general and applies also to targets that do not have a
 /* GDB represents the state of each program execution with an object
    called an inferior.  An inferior typically corresponds to a process
    but is more general and applies also to targets that do not have a


@@ -411,6 +435,14 @@ struct inferior
      the ptid_t.pid member of threads of this inferior.  */
   int pid;
 
      the ptid_t.pid member of threads of this inferior.  */
   int pid;
 

+  /* State of GDB control of inferior process execution.
+     See `struct inferior_control_state'.  */
+  struct inferior_control_state control;
+
+  /* State of inferior process to restore after GDB is done with an inferior
+     call.  See `struct inferior_suspend_state'.  */
+  struct inferior_suspend_state suspend;
+

   /* True if this was an auto-created inferior, e.g. created from
      following a fork; false, if this inferior was manually added by
      the user, and we should not attempt to prune it
   /* True if this was an auto-created inferior, e.g. created from
      following a fork; false, if this inferior was manually added by
      the user, and we should not attempt to prune it


@@ -442,9 +474,6 @@ struct inferior
      in format described in environ.h.  */
   struct gdb_environ *environment;
 
      in format described in environ.h.  */
   struct gdb_environ *environment;
 

-  /* See the definition of stop_kind above.  */
-  enum stop_kind stop_soon;
-

   /* Nonzero if this child process was attached rather than
      forked.  */
   int attach_flag;
   /* Nonzero if this child process was attached rather than
      forked.  */
   int attach_flag;


@@ -468,6 +497,9 @@ struct inferior
      either by exiting or execing.  */
   int waiting_for_vfork_done;
 
      either by exiting or execing.  */
   int waiting_for_vfork_done;
 

+  /* True if we're in the process of detaching from this inferior.  */
+  int detaching;
+

   /* What is left to do for an execution command after any thread of
      this inferior stops.  For continuations associated with a
      specific thread, see `struct thread_info'.  */
   /* What is left to do for an execution command after any thread of
      this inferior stops.  For continuations associated with a
      specific thread, see `struct thread_info'.  */


@@ -613,4 +645,6 @@ extern int number_of_inferiors (void);
 
 extern struct inferior *add_inferior_with_spaces (void);
 
 
 extern struct inferior *add_inferior_with_spaces (void);
 

+extern void update_observer_mode (void);
+

 #endif /* !defined (INFERIOR_H) */
 #endif /* !defined (INFERIOR_H) */