X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbreakpoint.h;h=9b79e3ec6738512b08dd6cecf85281d9ea925ca6;hb=c0a91b2b1432c7ecd7dfb558f9c37b6798b234d0;hp=86fae669fc39a77719bdc81670d96f89c073a3d8;hpb=a3be78903d86658beeac7227bc76cae9f05c0cac;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 86fae669fc..9b79e3ec67 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -28,6 +28,10 @@ struct value; struct block; struct breakpoint_object; +struct get_number_or_range_state; +struct thread_info; +struct bpstats; +struct bp_location; /* This is the maximum number of bytes a breakpoint instruction can take. Feel free to increase it. It's just used in a few places to @@ -67,10 +71,13 @@ enum bptype bp_exception_resume, /* Used by wait_for_inferior for stepping over subroutine calls, - for stepping over signal handlers, and for skipping - prologues. */ + and for skipping prologues. */ bp_step_resume, + /* Used by wait_for_inferior for stepping over signal + handlers. */ + bp_hp_step_resume, + /* Used to detect when a watchpoint expression has gone out of scope. These breakpoints are usually not visible to the user. @@ -148,6 +155,19 @@ enum bptype /* Event for JIT compiled code generation or deletion. */ bp_jit_event, + + /* Breakpoint is placed at the STT_GNU_IFUNC resolver. When hit GDB + inserts new bp_gnu_ifunc_resolver_return at the caller. + bp_gnu_ifunc_resolver is still being kept here as a different thread + may still hit it before bp_gnu_ifunc_resolver_return is hit by the + original thread. */ + bp_gnu_ifunc_resolver, + + /* On its hit GDB now know the resolved address of the target + STT_GNU_IFUNC function. Associated bp_gnu_ifunc_resolver can be + deleted now and the breakpoint moved to the target function entry + point. */ + bp_gnu_ifunc_resolver_return, }; /* States of enablement of breakpoint. */ @@ -217,6 +237,10 @@ struct bp_target_info is used to determine the type of breakpoint to insert. */ CORE_ADDR placed_address; + /* If this is a ranged breakpoint, then this field contains the + length of the range that will be watched for execution. */ + int length; + /* If the breakpoint lives in memory and reading that memory would give back the breakpoint, instead of the original contents, then the original contents are cached here. Only SHADOW_LEN bytes of @@ -256,12 +280,26 @@ enum bp_loc_type bp_loc_other /* Miscellaneous... */ }; +/* This structure is a collection of function pointers that, if + available, will be called instead of performing the default action + for this bp_loc_type. */ + +struct bp_location_ops +{ + /* Destructor. Releases everything from SELF (but not SELF + itself). */ + void (*dtor) (struct bp_location *self); +}; + struct bp_location { /* Chain pointer to the next breakpoint location for the same parent breakpoint. */ struct bp_location *next; + /* Methods associated with this location. */ + const struct bp_location_ops *ops; + /* The reference count. */ int refc; @@ -325,7 +363,8 @@ struct bp_location CORE_ADDR address; /* For hardware watchpoints, the size of the memory region being - watched. */ + watched. For hardware ranged breakpoints, the size of the + breakpoint range. */ int length; /* Type of hardware watchpoint. */ @@ -370,9 +409,21 @@ struct bp_location struct breakpoint_ops { + /* Destructor. Releases everything from SELF (but not SELF + itself). */ + void (*dtor) (struct breakpoint *self); + + /* Allocate a location for this breakpoint. */ + struct bp_location * (*allocate_location) (struct breakpoint *); + + /* Reevaluate a breakpoint. This is necessary after symbols change + (e.g., an executable or DSO was loaded, or the inferior just + started). */ + void (*re_set) (struct breakpoint *self); + /* Insert the breakpoint or watchpoint or activate the catchpoint. - Return 0 for success, 1 if the breakpoint, watchpoint or catchpoint - type is not supported, -1 for failure. */ + Return 0 for success, 1 if the breakpoint, watchpoint or + catchpoint type is not supported, -1 for failure. */ int (*insert_location) (struct bp_location *); /* Remove the breakpoint/catchpoint that was previously inserted @@ -381,23 +432,48 @@ struct breakpoint_ops -1 for failure. */ int (*remove_location) (struct bp_location *); - /* Return non-zero if the debugger should tell the user that this - breakpoint was hit. */ - int (*breakpoint_hit) (struct breakpoint *); + /* Return true if it the target has stopped due to hitting + breakpoint location BL. This function does not check if we + should stop, only if BL explains the stop. */ + int (*breakpoint_hit) (const struct bp_location *bl, struct address_space *, + CORE_ADDR); + + /* Check internal conditions of the breakpoint referred to by BS. + If we should not stop for this breakpoint, set BS->stop to 0. */ + void (*check_status) (struct bpstats *bs); /* Tell how many hardware resources (debug registers) are needed for this breakpoint. If this function is not provided, then the breakpoint or watchpoint needs one debug register. */ int (*resources_needed) (const struct bp_location *); + /* Tell whether we can downgrade from a hardware watchpoint to a software + one. If not, the user will not be able to enable the watchpoint when + there are not enough hardware resources available. */ + int (*works_in_software_mode) (const struct breakpoint *); + /* The normal print routine for this breakpoint, called when we hit it. */ - enum print_stop_action (*print_it) (struct breakpoint *); + enum print_stop_action (*print_it) (struct bpstats *bs); /* Display information about this breakpoint, for "info breakpoints". */ void (*print_one) (struct breakpoint *, struct bp_location **); + /* Display extra information about this breakpoint, below the normal + breakpoint description in "info breakpoints". + + In the example below, the "address range" line was printed + by print_one_detail_ranged_breakpoint. + + (gdb) info breakpoints + Num Type Disp Enb Address What + 2 hw breakpoint keep y in main at test-watch.c:70 + address range: [0x10000458, 0x100004c7] + + */ + void (*print_one_detail) (const struct breakpoint *, struct ui_out *); + /* Display information about this breakpoint after setting it (roughly speaking; this is called from "mention"). */ void (*print_mention) (struct breakpoint *); @@ -406,6 +482,15 @@ struct breakpoint_ops void (*print_recreate) (struct breakpoint *, struct ui_file *fp); }; +/* Helper for breakpoint_ops->print_recreate implementations. Prints + the "thread" or "task" condition of B, and then a newline. + + Necessary because most breakpoint implementations accept + thread/task conditions at the end of the spec line, like "break foo + thread 1", which needs outputting before any breakpoint-type + specific extra command necessary for B's recreation. */ +extern void print_recreate_thread (struct breakpoint *b, struct ui_file *fp); + enum watchpoint_triggered { /* This watchpoint definitely did not trigger. */ @@ -443,10 +528,13 @@ extern int target_exact_watchpoints; useful for a hack I had to put in; I'm going to leave it in because I can see how there might be times when it would indeed be useful */ -/* This is for a breakpoint or a watchpoint. */ +/* This is for all kinds of breakpoints. */ struct breakpoint { + /* Methods associated with this breakpoint. */ + const struct breakpoint_ops *ops; + struct breakpoint *next; /* Type of breakpoint. */ enum bptype type; @@ -471,6 +559,8 @@ struct breakpoint /* Non-zero means a silent breakpoint (don't print frame info if we stop here). */ unsigned char silent; + /* Non-zero means display ADDR_STRING to the user verbatim. */ + unsigned char display_canonical; /* Number of stops at this breakpoint that should be continued automatically before really stopping. */ int ignore_count; @@ -486,6 +576,11 @@ struct breakpoint /* String we used to set the breakpoint (malloc'd). */ char *addr_string; + + /* For a ranged breakpoint, the string we used to find + the end of the range (malloc'd). */ + char *addr_string_range_end; + /* Architecture we used to set the breakpoint. */ struct gdbarch *gdbarch; /* Language we used to set the breakpoint. */ @@ -497,27 +592,6 @@ struct breakpoint char *cond_string; /* String form of exp to use for displaying to the user (malloc'd), or NULL if none. */ - char *exp_string; - /* String form to use for reparsing of EXP (malloc'd) or NULL. */ - char *exp_string_reparse; - - /* The expression we are watching, or NULL if not a watchpoint. */ - struct expression *exp; - /* 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; - /* The conditional expression if any. NULL if not a watchpoint. */ - struct expression *cond_exp; - /* The largest block within which it is valid, or NULL if it is - valid anywhere (e.g. consists just of global symbols). */ - struct block *cond_exp_valid_block; - /* 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; - /* 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 of @@ -526,20 +600,6 @@ struct breakpoint FIXME). */ struct breakpoint *related_breakpoint; - /* Holds the frame address which identifies the frame this - watchpoint should be evaluated in, or `null' if the watchpoint - should be evaluated on the outermost frame. */ - struct frame_id watchpoint_frame; - - /* Holds the thread which identifies the frame this watchpoint - should be considered in scope for, or `null_ptid' if the - watchpoint should be evaluated in all threads. */ - ptid_t watchpoint_thread; - - /* For hardware watchpoints, the triggered status according to the - hardware. */ - enum watchpoint_triggered watchpoint_triggered; - /* Thread number for thread-specific breakpoint, or -1 if don't care. */ int thread; @@ -554,64 +614,110 @@ struct breakpoint aborting, so you can back up to just before the abort. */ int hit_count; - /* Process id of a child process whose forking triggered this - catchpoint. This field is only valid immediately after this - catchpoint has triggered. */ - ptid_t forked_inferior_pid; - - /* Filename of a program whose exec triggered this catchpoint. - This field is only valid immediately after this catchpoint has - triggered. */ - char *exec_pathname; - - /* Syscall numbers used for the 'catch syscall' feature. If no - syscall has been specified for filtering, its value is NULL. - Otherwise, it holds a list of all syscalls to be caught. The - list elements are allocated with xmalloc. */ - VEC(int) *syscalls_to_be_caught; - - /* Methods associated with this breakpoint. */ - struct breakpoint_ops *ops; - /* Is breakpoint's condition not yet parsed because we found 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; - - /* The number of the tracepoint on the target. */ - int number_on_target; - - /* The static tracepoint marker id, if known. */ - char *static_trace_marker_id; - - /* LTTng/UST allow more than one marker with the same ID string, - although it unadvised because it confuses tools. When setting - static tracepoints by marker ID, this will record the index in - the array of markers we found for the given marker ID for which - this static tracepoint corresponds. When resetting - breakpoints, we will use this index to try to find the same - marker again. */ - int static_trace_marker_id_idx; - /* With a Python scripting enabled GDB, store a reference to the Python object that has been associated with this breakpoint. This is always NULL for a GDB that is not script enabled. It can sometimes be NULL for enabled GDBs as not all breakpoint types are tracked by the Python scripting API. */ struct breakpoint_object *py_bp_object; - - /* Whether this watchpoint is exact (see target_exact_watchpoints). */ - int exact; }; +/* An instance of this type is used to represent a watchpoint. It + includes a "struct breakpoint" as a kind of base class; users + downcast to "struct breakpoint *" when needed. */ + +struct watchpoint +{ + /* The base class. */ + struct breakpoint base; + + /* String form of exp to use for displaying to the user (malloc'd), + or NULL if none. */ + char *exp_string; + /* String form to use for reparsing of EXP (malloc'd) or NULL. */ + char *exp_string_reparse; + + /* The expression we are watching, or NULL if not a watchpoint. */ + struct expression *exp; + /* 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; + /* The conditional expression if any. */ + struct expression *cond_exp; + /* The largest block within which it is valid, or NULL if it is + valid anywhere (e.g. consists just of global symbols). */ + struct block *cond_exp_valid_block; + /* 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; + /* 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 frame address which identifies the frame this + watchpoint should be evaluated in, or `null' if the watchpoint + should be evaluated on the outermost frame. */ + struct frame_id watchpoint_frame; + + /* Holds the thread which identifies the frame this watchpoint + should be considered in scope for, or `null_ptid' if the + watchpoint should be evaluated in all threads. */ + ptid_t watchpoint_thread; + + /* For hardware watchpoints, the triggered status according to the + hardware. */ + enum watchpoint_triggered watchpoint_triggered; + + /* Whether this watchpoint is exact (see + target_exact_watchpoints). */ + int exact; + + /* The mask address for a masked hardware watchpoint. */ + CORE_ADDR hw_wp_mask; +}; + +/* Returns true if BPT is really a watchpoint. */ + +extern int is_watchpoint (const struct breakpoint *bpt); + +/* An instance of this type is used to represent all kinds of + tracepoints. It includes a "struct breakpoint" as a kind of base + class; users downcast to "struct breakpoint *" when needed. */ + +struct tracepoint +{ + /* The base class. */ + struct breakpoint base; + + /* 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; + + /* The number of the tracepoint on the target. */ + int number_on_target; + + /* The static tracepoint marker id, if known. */ + char *static_trace_marker_id; + + /* LTTng/UST allow more than one marker with the same ID string, + although it unadvised because it confuses tools. When setting + static tracepoints by marker ID, this will record the index in + the array of markers we found for the given marker ID for which + this static tracepoint corresponds. When resetting breakpoints, + we will use this index to try to find the same marker again. */ + int static_trace_marker_id_idx; +}; + typedef struct breakpoint *breakpoint_p; DEF_VEC_P(breakpoint_p); @@ -672,6 +778,9 @@ enum bpstat_what_main_action BPSTAT_WHAT_KEEP_CHECKING. */ BPSTAT_WHAT_CLEAR_LONGJMP_RESUME, + /* Clear step resume breakpoint, and keep checking. */ + BPSTAT_WHAT_STEP_RESUME, + /* Rather than distinguish between noisy and silent stops here, it might be cleaner to have bpstat_print make that decision (also taking into account stop_print_frame and source_only). But the @@ -684,8 +793,14 @@ enum bpstat_what_main_action /* Stop and print. */ BPSTAT_WHAT_STOP_NOISY, - /* Clear step resume breakpoint, and keep checking. */ - BPSTAT_WHAT_STEP_RESUME, + /* Clear step resume breakpoint, and keep checking. High-priority + step-resume breakpoints are used when even if there's a user + breakpoint at the current PC when we set the step-resume + breakpoint, we don't want to re-handle any breakpoint other + than the step-resume when it's hit; instead we want to move + past the breakpoint. This is used in the case of skipping + signal handlers. */ + BPSTAT_WHAT_HP_STEP_RESUME, }; /* An enum indicating the kind of "stack dummy" stop. This is a bit @@ -722,9 +837,19 @@ struct bpstat_what print_it_done, print_it_noop. */ enum print_stop_action { + /* We printed nothing or we need to do some more analysis. */ PRINT_UNKNOWN = -1, + + /* We printed something, and we *do* desire that something to be + followed by a location. */ PRINT_SRC_AND_LOC, + + /* We printed something, and we do *not* desire that something to + be followed by a location. */ PRINT_SRC_ONLY, + + /* We already printed all we needed to print, don't print anything + else. */ PRINT_NOTHING }; @@ -887,6 +1012,16 @@ extern int breakpoint_thread_match (struct address_space *, extern void until_break_command (char *, int, int); +/* Initialize a struct bp_location. */ + +extern void init_bp_location (struct bp_location *loc, + const struct bp_location_ops *ops, + struct breakpoint *owner); + +extern void update_breakpoint_locations (struct breakpoint *b, + struct symtabs_and_lines sals, + struct symtabs_and_lines sals_end); + extern void breakpoint_re_set (void); extern void breakpoint_re_set_thread (struct breakpoint *); @@ -916,6 +1051,10 @@ extern void breakpoint_auto_delete (bpstat); is hit. */ extern struct command_line *breakpoint_commands (struct breakpoint *b); +/* Return a string image of DISP. The string is static, and thus should + NOT be deallocated after use. */ +const char *bpdisp_text (enum bpdisp disp); + extern void break_command (char *, int); extern void hbreak_command_wrapper (char *, int); @@ -926,13 +1065,52 @@ extern void awatch_command_wrapper (char *, int, int); extern void rwatch_command_wrapper (char *, int, int); extern void tbreak_command (char *, int); +extern struct breakpoint_ops bkpt_breakpoint_ops; + +extern void initialize_breakpoint_ops (void); + +/* Arguments to pass as context to some catch command handlers. */ +#define CATCH_PERMANENT ((void *) (uintptr_t) 0) +#define CATCH_TEMPORARY ((void *) (uintptr_t) 1) + +/* Like add_cmd, but add the command to both the "catch" and "tcatch" + lists, and pass some additional user data to the command + function. */ + +extern void + add_catch_command (char *name, char *docstring, + void (*sfunc) (char *args, int from_tty, + struct cmd_list_element *command), + char **(*completer) (struct cmd_list_element *cmd, + char *text, char *word), + void *user_data_catch, + void *user_data_tcatch); + +/* Initialize a breakpoint struct for Ada exception catchpoints. */ + +extern void + init_ada_exception_breakpoint (struct breakpoint *b, + struct gdbarch *gdbarch, + struct symtab_and_line sal, + char *addr_string, + const struct breakpoint_ops *ops, + int tempflag, + int from_tty); + +/* Add breakpoint B on the breakpoint list, and notify the user, the + target and breakpoint_created observers of its existence. If + INTERNAL is non-zero, the breakpoint number will be allocated from + the internal breakpoint count. */ + +extern void install_breakpoint (int internal, struct breakpoint *b); + extern int create_breakpoint (struct gdbarch *gdbarch, char *arg, char *cond_string, int thread, int parse_condition_and_thread, int tempflag, enum bptype wanted_type, int ignore_count, enum auto_boolean pending_break_support, - struct breakpoint_ops *ops, + const struct breakpoint_ops *ops, int from_tty, int enabled, int internal); @@ -995,7 +1173,7 @@ extern void delete_std_terminate_breakpoint (void); /* These functions respectively disable or reenable all currently enabled watchpoints. When disabled, the watchpoints are marked - call_disabled. When reenabled, they are marked enabled. + call_disabled. When re-enabled, they are marked enabled. The intended client of these functions is call_function_by_hand. @@ -1009,7 +1187,7 @@ extern void delete_std_terminate_breakpoint (void); and that can cause execution control to become very confused. Note that if a user sets breakpoints in an interactively called - function, the call_disabled watchpoints will have been reenabled + function, the call_disabled watchpoints will have been re-enabled when the first such breakpoint is reached. However, on targets that are unable to unwind through the call dummy frame, watches of stack-based storage may then be deleted, because gdb will @@ -1039,10 +1217,6 @@ extern enum command_control_type commands_from_control_command extern void clear_breakpoint_hit_counts (void); -extern int get_number (char **); - -extern int get_number_or_range (char **); - extern struct breakpoint *get_breakpoint (int num); /* The following are for displays, which aren't really breakpoints, @@ -1098,10 +1272,6 @@ extern int ep_is_catchpoint (struct breakpoint *); deletes all breakpoints. */ extern void delete_command (char *arg, int from_tty); -/* Pull all H/W watchpoints from the target. Return non-zero if the - remove fails. */ -extern int remove_hw_watchpoints (void); - /* Manage a software single step breakpoint (or two). Insert may be called twice before remove is called. */ extern void insert_single_step_breakpoint (struct gdbarch *, @@ -1149,14 +1319,15 @@ extern int catch_syscall_enabled (void); extern int catching_syscall_number (int syscall_number); /* Return a tracepoint with the given number if found. */ -extern struct breakpoint *get_tracepoint (int num); +extern struct tracepoint *get_tracepoint (int num); -extern struct breakpoint *get_tracepoint_by_number_on_target (int num); +extern struct tracepoint *get_tracepoint_by_number_on_target (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); +extern struct tracepoint * + get_tracepoint_by_number (char **arg, + struct get_number_or_range_state *state, + int optional_p); /* Return a vector of all tracepoints currently defined. The vector is newly allocated; the caller should free when done with it. */