X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbreakpoint.h;h=17b2761669918456a225ea78a3ee2960e31086c4;hb=4a306c9a890a18d28bd88e18937a1061223201d0;hp=56b9a6ee46fc521cb268e79fbe347758903ce52e;hpb=e236ba4424253599ed1f75a522c863d2afc8cd03;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 56b9a6ee46..17b2761669 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1,6 +1,6 @@ /* Data structures associated with breakpoints in GDB. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2007 Free Software Foundation, Inc. + 2002, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GDB. @@ -24,8 +24,6 @@ #include "value.h" #include "vec.h" -#include "gdb-events.h" - struct value; struct block; @@ -112,30 +110,9 @@ enum bptype bp_overlay_event, - /* These breakpoints are used to implement the "catch load" command - on platforms whose dynamic linkers support such functionality. */ - bp_catch_load, - - /* These breakpoints are used to implement the "catch unload" command - on platforms whose dynamic linkers support such functionality. */ - bp_catch_unload, - - /* These are not really breakpoints, but are catchpoints that - implement the "catch fork", "catch vfork" and "catch exec" commands - on platforms whose kernel support such functionality. (I.e., - kernels which can raise an event when a fork or exec occurs, as - opposed to the debugger setting breakpoints on functions named - "fork" or "exec".) */ - bp_catch_fork, - bp_catch_vfork, - bp_catch_exec, - - /* These are catchpoints to implement "catch catch" and "catch throw" - commands for C++ exception handling. */ - bp_catch_catch, - bp_catch_throw - + bp_catchpoint, + bp_tracepoint, }; /* States of enablement of breakpoint. */ @@ -280,9 +257,15 @@ struct bp_location bp_loc_other. */ CORE_ADDR address; - /* For any breakpoint type with an address, this is the BFD section + /* For hardware watchpoints, the size of data ad ADDRESS being watches. */ + int length; + + /* Type of hardware watchpoint. */ + enum target_hw_bp_type watchpoint_type; + + /* For any breakpoint type with an address, this is the section associated with the address. Used primarily for overlay debugging. */ - asection *section; + struct obj_section *section; /* Address at which breakpoint was requested, either by the user or by GDB for internal breakpoints. This will usually be the same @@ -299,6 +282,17 @@ struct bp_location /* Similarly, for the breakpoint at an overlay's LMA, if necessary. */ struct bp_target_info overlay_target_info; + + /* In a non-stop mode, it's possible that we delete a breakpoint, + but as we do that, some still running thread hits that breakpoint. + For that reason, we need to keep locations belonging to deleted + breakpoints for a bit, so that don't report unexpected SIGTRAP. + We can't keep such locations forever, so we use a heuristic -- + after we process certain number of inferior events since + breakpoint was deleted, we retire all locations of that breakpoint. + This variable keeps a number of events still to go, when + it becomes 0 this location is retired. */ + int events_till_retirement; }; /* This structure is a collection of function pointers that, if available, @@ -307,6 +301,19 @@ struct bp_location struct breakpoint_ops { + /* Insert the breakpoint or activate the catchpoint. Should raise + an exception if the operation failed. */ + void (*insert) (struct breakpoint *); + + /* Remove the breakpoint/catchpoint that was previously inserted + with the "insert" method above. Return non-zero if the operation + succeeded. */ + int (*remove) (struct breakpoint *); + + /* Return non-zero if the debugger should tell the user that this + breakpoint was hit. */ + int (*breakpoint_hit) (struct breakpoint *); + /* The normal print routine for this breakpoint, called when we hit it. */ enum print_stop_action (*print_it) (struct breakpoint *); @@ -332,6 +339,9 @@ enum watchpoint_triggered watch_triggered_yes }; +typedef struct bp_location *bp_location_p; +DEF_VEC_P(bp_location_p); + /* Note that the ->silent field is not currently used by any commands (though the code is in there if it was to be, and set_raw_breakpoint does set it to 0). I implemented it because I thought it would be @@ -392,11 +402,13 @@ struct breakpoint /* The largest block within which it is valid, or NULL if it is valid anywhere (e.g. consists just of global symbols). */ struct block *exp_valid_block; - /* Value of the watchpoint the last time we checked it. */ + /* Value of the watchpoint the last time we checked it, or NULL + when we do not know the value yet or the value was not + readable. VAL is never lazy. */ struct value *val; - - /* Holds the value chain for a hardware watchpoint expression. */ - struct value *val_chain; + /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, + then an error occurred reading the value. */ + int val_valid; /* Holds the address of the related watchpoint_scope breakpoint when using watchpoints on local variables (might the concept @@ -413,29 +425,22 @@ struct breakpoint hardware. */ enum watchpoint_triggered watchpoint_triggered; - /* Thread number for thread-specific breakpoint, or -1 if don't care */ + /* Thread number for thread-specific breakpoint, or -1 if don't care. */ int thread; + /* Ada task number for task-specific breakpoint, or 0 if don't care. */ + int task; + /* Count of the number of times this breakpoint was taken, dumped with the info, but not used for anything else. Useful for seeing how many times you hit a break prior to the program aborting, so you can back up to just before the abort. */ int hit_count; - /* Filename of a dynamically-linked library (dll), used for - bp_catch_load and bp_catch_unload (malloc'd), or NULL if any - library is significant. */ - char *dll_pathname; - - /* Filename of a dll whose state change (e.g., load or unload) - triggered this catchpoint. This field is only valid immediately - after this catchpoint has triggered. */ - char *triggered_dll_pathname; - /* Process id of a child process whose forking triggered this catchpoint. This field is only valid immediately after this catchpoint has triggered. */ - int forked_inferior_pid; + ptid_t forked_inferior_pid; /* Filename of a program whose exec triggered this catchpoint. This field is only valid immediately after this catchpoint has @@ -449,6 +454,17 @@ struct breakpoint no location initially so had no context to parse the condition in. */ int condition_not_parsed; + + /* Number of times this tracepoint should single-step + and collect additional data. */ + long step_count; + + /* Number of times this tracepoint should be hit before + disabling/ending. */ + int pass_count; + + /* Chain of action lines to execute when this tracepoint is hit. */ + struct action_line *actions; }; typedef struct breakpoint *breakpoint_p; @@ -512,9 +528,6 @@ enum bpstat_what_main_action BPSTAT_WHAT_KEEP_CHECKING. */ BPSTAT_WHAT_CLEAR_LONGJMP_RESUME, - /* Clear longjmp_resume breakpoint, then handle as BPSTAT_WHAT_SINGLE. */ - BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE, - /* Clear step resume breakpoint, and keep checking. */ BPSTAT_WHAT_STEP_RESUME, @@ -522,10 +535,6 @@ enum bpstat_what_main_action keep checking. */ BPSTAT_WHAT_CHECK_SHLIBS, - /* Check the dynamic linker's data structures for new libraries, then - resume out of the dynamic linker's callback, stop and print. */ - BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK, - /* This is just used to keep track of how many enums there are. */ BPSTAT_WHAT_LAST }; @@ -579,9 +588,6 @@ extern struct breakpoint *bpstat_find_step_resume_breakpoint (bpstat); just to things like whether watchpoints are set. */ extern int bpstat_should_step (void); -/* Nonzero if there are enabled hardware watchpoints. */ -extern int bpstat_have_active_hw_watchpoints (void); - /* Print a message indicating what happened. Returns nonzero to say that only the source line should be printed after this (zero return means print the frame as well as the source line). */ @@ -597,20 +603,15 @@ extern enum print_stop_action bpstat_print (bpstat); Return 1 otherwise. */ extern int bpstat_num (bpstat *, int *); -/* Perform actions associated with having stopped at *BSP. Actually, we just - use this for breakpoint commands. Perhaps other actions will go here - later, but this is executed at a late time (from the command loop). */ -extern void bpstat_do_actions (bpstat *); +/* Perform actions associated with the stopped inferior. Actually, we + just use this for breakpoint commands. Perhaps other actions will + go here later, but this is executed at a late time (from the + command loop). */ +extern void bpstat_do_actions (void); /* Modify BS so that the actions will not be performed. */ extern void bpstat_clear_actions (bpstat); -/* Given a bpstat that records zero or more triggered eventpoints, this - function returns another bpstat which contains only the catchpoints - on that first list, if any. - */ -extern void bpstat_get_triggered_catchpoints (bpstat, bpstat *); - /* Implementation: */ /* Values used to tell the printing routine how to behave for this bpstat. */ @@ -655,7 +656,8 @@ enum inf_context { inf_starting, inf_running, - inf_exited + inf_exited, + inf_execd }; /* The possible return values for breakpoint_here_p. @@ -672,6 +674,8 @@ enum breakpoint_here extern enum breakpoint_here breakpoint_here_p (CORE_ADDR); +extern int moribund_breakpoint_here_p (CORE_ADDR); + extern int breakpoint_inserted_here_p (CORE_ADDR); extern int regular_breakpoint_inserted_here_p (CORE_ADDR); @@ -686,11 +690,12 @@ extern void breakpoint_re_set (void); extern void breakpoint_re_set_thread (struct breakpoint *); -extern int ep_is_exception_catchpoint (struct breakpoint *); - extern struct breakpoint *set_momentary_breakpoint (struct symtab_and_line, struct frame_id, enum bptype); +extern struct breakpoint *set_momentary_breakpoint_at_pc + (CORE_ADDR pc, enum bptype type); + extern void set_ignore_count (int, int, int); extern void set_default_breakpoint (int, CORE_ADDR, struct symtab *, int); @@ -699,14 +704,10 @@ extern void breakpoint_init_inferior (enum inf_context); extern struct cleanup *make_cleanup_delete_breakpoint (struct breakpoint *); -extern struct cleanup *make_exec_cleanup_delete_breakpoint (struct breakpoint *); - extern void delete_breakpoint (struct breakpoint *); extern void breakpoint_auto_delete (bpstat); -extern void breakpoint_clear_ignore_counts (void); - extern void break_command (char *, int); extern void hbreak_command_wrapper (char *, int); @@ -717,6 +718,12 @@ extern void awatch_command_wrapper (char *, int); extern void rwatch_command_wrapper (char *, int); extern void tbreak_command (char *, int); +extern void set_breakpoint (char *address, char *condition, + int hardwareflag, int tempflag, + int thread, int ignore_count, + int pending, + int enabled); + extern void insert_breakpoints (void); extern int remove_breakpoints (void); @@ -756,12 +763,12 @@ extern void update_breakpoints_after_exec (void); inferior_ptid. */ extern int detach_breakpoints (int); -extern void enable_longjmp_breakpoint (void); -extern void disable_longjmp_breakpoint (void); +extern void set_longjmp_breakpoint (void); +extern void delete_longjmp_breakpoint (int thread); + extern void enable_overlay_breakpoints (void); extern void disable_overlay_breakpoints (void); -extern void set_longjmp_resume_breakpoint (CORE_ADDR, struct frame_id); /* These functions respectively disable or reenable all currently enabled watchpoints. When disabled, the watchpoints are marked call_disabled. When reenabled, they are marked enabled. @@ -813,6 +820,9 @@ extern void disable_breakpoint (struct breakpoint *); extern void enable_breakpoint (struct breakpoint *); +/* Clear the "inserted" flag in all breakpoints. */ +extern void mark_breakpoints_out (void); + extern void make_breakpoint_permanent (struct breakpoint *); extern struct breakpoint *create_solib_event_breakpoint (CORE_ADDR); @@ -828,11 +838,6 @@ extern void disable_breakpoints_in_shlibs (void); /* This function returns TRUE if ep is a catchpoint. */ extern int ep_is_catchpoint (struct breakpoint *); -/* This function returns TRUE if ep is a catchpoint of a - shared library (aka dynamically-linked library) event, - such as a library load or unload. */ -extern int ep_is_shlib_catchpoint (struct breakpoint *); - /* Enable breakpoints and delete when hit. Called with ARG == NULL deletes all breakpoints. */ extern void delete_command (char *arg, int from_tty); @@ -856,4 +861,30 @@ extern int deprecated_remove_raw_breakpoint (void *); target. */ int watchpoints_triggered (struct target_waitstatus *); +/* Update BUF, which is LEN bytes read from the target address MEMADDR, + by replacing any memory breakpoints with their shadowed contents. */ +void breakpoint_restore_shadows (gdb_byte *buf, ULONGEST memaddr, + LONGEST len); + +extern int breakpoints_always_inserted_mode (void); + +/* Called each time new event from target is processed. + Retires previously deleted breakpoint locations that + in our opinion won't ever trigger. */ +extern void breakpoint_retire_moribund (void); + +/* Tell a breakpoint to be quiet. */ +extern void make_breakpoint_silent (struct breakpoint *); + +/* Return a tracepoint with the given number if found. */ +extern struct breakpoint *get_tracepoint (int num); + +/* Find a tracepoint by parsing a number in the supplied string. */ +extern struct breakpoint *get_tracepoint_by_number (char **arg, int multi_p, + int optional_p); + +/* Return a vector of all tracepoints currently defined. The vector + is newly allocated; the caller should free when done with it. */ +extern VEC(breakpoint_p) *all_tracepoints (void); + #endif /* !defined (BREAKPOINT_H) */