From bfb8cf9091a174b42beeff3d014173084413af4d Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 13 Apr 2017 03:07:21 +0100 Subject: [PATCH] struct breakpoint: Fix indentation I'm going to need to touch all these fields to add in-class initialization anyway, might as well take the opportunity to finally fix this... gdb/ChangeLog: 2017-04-13 Pedro Alves * breakpoint.h (struct breakpoint): Reindent. --- gdb/ChangeLog | 4 ++ gdb/breakpoint.h | 205 +++++++++++++++++++++++++++---------------------------- 2 files changed, 106 insertions(+), 103 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5fba46e..315932e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-04-13 Pedro Alves + * breakpoint.h (struct breakpoint): Reindent. + +2017-04-13 Pedro Alves + * breakpoint.c (bp_location): Rename to ... (bp_locations): ... this. All references updated. (bp_location_count): Rename to ... diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index f5c2751..9b5dc3f 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -674,110 +674,109 @@ extern int target_exact_watchpoints; /* 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; - /* Zero means disabled; remember the info but don't break here. */ - enum enable_state enable_state; - /* What to do with this breakpoint after we hit it. */ - enum bpdisp disposition; - /* Number assigned to distinguish breakpoints. */ - int number; - - /* Location(s) associated with this high-level breakpoint. */ - struct bp_location *loc; - - /* 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; - - /* Number of stops at this breakpoint before it will be - disabled. */ - int enable_count; - - /* Chain of command lines to execute when this breakpoint is - hit. */ - struct counted_command_line *commands; - /* Stack depth (address of frame). If nonzero, break only if fp - equals this. */ - struct frame_id frame_id; - - /* The program space used to set the breakpoint. This is only set - for breakpoints which are specific to a program space; for - non-thread-specific ordinary breakpoints this is NULL. */ - struct program_space *pspace; - - /* Location we used to set the breakpoint. */ - event_location_up location; - - /* The filter that should be passed to decode_line_full when - re-setting this breakpoint. This may be NULL, but otherwise is - allocated with xmalloc. */ - char *filter; - - /* For a ranged breakpoint, the location we used to find - the end of the range. */ - event_location_up location_range_end; - - /* Architecture we used to set the breakpoint. */ - struct gdbarch *gdbarch; - /* Language we used to set the breakpoint. */ - enum language language; - /* Input radix we used to set the breakpoint. */ - int input_radix; - /* String form of the breakpoint condition (malloc'd), or NULL if - there is no condition. */ - char *cond_string; - - /* String form of extra parameters, or NULL if there are none. +{ + /* Methods associated with this breakpoint. */ + const struct breakpoint_ops *ops; + + struct breakpoint *next; + /* Type of breakpoint. */ + enum bptype type; + /* Zero means disabled; remember the info but don't break here. */ + enum enable_state enable_state; + /* What to do with this breakpoint after we hit it. */ + enum bpdisp disposition; + /* Number assigned to distinguish breakpoints. */ + int number; + + /* Location(s) associated with this high-level breakpoint. */ + struct bp_location *loc; + + /* 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; + + /* Number of stops at this breakpoint before it will be + disabled. */ + int enable_count; + + /* Chain of command lines to execute when this breakpoint is + hit. */ + struct counted_command_line *commands; + /* Stack depth (address of frame). If nonzero, break only if fp + equals this. */ + struct frame_id frame_id; + + /* The program space used to set the breakpoint. This is only set + for breakpoints which are specific to a program space; for + non-thread-specific ordinary breakpoints this is NULL. */ + struct program_space *pspace; + + /* Location we used to set the breakpoint. */ + event_location_up location; + + /* The filter that should be passed to decode_line_full when + re-setting this breakpoint. This may be NULL, but otherwise is + allocated with xmalloc. */ + char *filter; + + /* For a ranged breakpoint, the location we used to find the end of + the range. */ + event_location_up location_range_end; + + /* Architecture we used to set the breakpoint. */ + struct gdbarch *gdbarch; + /* Language we used to set the breakpoint. */ + enum language language; + /* Input radix we used to set the breakpoint. */ + int input_radix; + /* String form of the breakpoint condition (malloc'd), or NULL if + there is no condition. */ + char *cond_string; + + /* String form of extra parameters, or NULL if there are none. Malloc'd. */ - char *extra_string; - - /* Holds the address of the related watchpoint_scope breakpoint - when using watchpoints on local variables (might the concept of - a related breakpoint be useful elsewhere, if not just call it - the watchpoint_scope breakpoint or something like that. - FIXME). */ - struct breakpoint *related_breakpoint; - - /* 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; - - /* 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; - - /* 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 scripting language API. */ - struct gdbpy_breakpoint_object *py_bp_object; - - /* Same as py_bp_object, but for Scheme. */ - struct gdbscm_breakpoint_object *scm_bp_object; - }; + char *extra_string; + + /* Holds the address of the related watchpoint_scope breakpoint when + using watchpoints on local variables (might the concept of a + related breakpoint be useful elsewhere, if not just call it the + watchpoint_scope breakpoint or something like that. FIXME). */ + struct breakpoint *related_breakpoint; + + /* 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; + + /* 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; + + /* 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 scripting language API. */ + struct gdbpy_breakpoint_object *py_bp_object; + + /* Same as py_bp_object, but for Scheme. */ + struct gdbscm_breakpoint_object *scm_bp_object; +}; /* An instance of this type is used to represent a watchpoint. It includes a "struct breakpoint" as a kind of base class; users -- 2.7.4