From ee180d596d8610b4554ea76839f3a8a6da984a69 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 10 Nov 2011 08:55:34 -0700 Subject: [PATCH 1/4] remove bp_startup_disabled --- gdb/ChangeLog | 14 +++++++++++ gdb/breakpoint.c | 67 ++++++----------------------------------------------- gdb/breakpoint.h | 8 ------ 3 files changed, 22 insertions(+), 67 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1f406fa..431256a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2011-11-16 Tom Tromey + + * breakpoint.h (enum enable_state) : Remove. + * breakpoint.c (should_be_inserted): Explicitly check if program + space is executing startup. + (describe_other_breakpoints): Update. + (disable_breakpoints_before_startup): Change executing_startup + earlier. Remove loop. + (enable_breakpoints_after_startup): Likewise. + (init_breakpoint_sal): Don't use bp_startup_disabled. + (create_breakpoint): Don't use bp_startup_disabled. + (update_global_location_list): Use should_be_inserted. + (bkpt_re_set): Update. + 2011-11-15 Doug Evans * buildsym.c (add_symbol_to_list): Delete outdated comment. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8f09296..2494520 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1574,6 +1574,9 @@ should_be_inserted (struct bp_location *bl) if (!bl->enabled || bl->shlib_disabled || bl->duplicate) return 0; + if (user_breakpoint_p (bl->owner) && bl->pspace->executing_startup) + return 0; + /* This is set for example, when we're attached to the parent of a vfork, and have detached from the child. The child is running free, and we expect it to do an exec or exit, at which point the @@ -5314,8 +5317,7 @@ describe_other_breakpoints (struct gdbarch *gdbarch, printf_filtered (" (thread %d)", b->thread); printf_filtered ("%s%s ", ((b->enable_state == bp_disabled - || b->enable_state == bp_call_disabled - || b->enable_state == bp_startup_disabled) + || b->enable_state == bp_call_disabled) ? " (disabled)" : b->enable_state == bp_permanent ? " (permanent)" @@ -6930,53 +6932,15 @@ enable_watchpoints_after_interactive_call_stop (void) void disable_breakpoints_before_startup (void) { - struct breakpoint *b; - int found = 0; - - ALL_BREAKPOINTS (b) - { - if (b->pspace != current_program_space) - continue; - - if ((b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint) - && breakpoint_enabled (b)) - { - b->enable_state = bp_startup_disabled; - found = 1; - } - } - - if (found) - update_global_location_list (0); - current_program_space->executing_startup = 1; + update_global_location_list (0); } void enable_breakpoints_after_startup (void) { - struct breakpoint *b; - int found = 0; - current_program_space->executing_startup = 0; - - ALL_BREAKPOINTS (b) - { - if (b->pspace != current_program_space) - continue; - - if ((b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint) - && b->enable_state == bp_startup_disabled) - { - b->enable_state = bp_enabled; - found = 1; - } - } - - if (found) - breakpoint_re_set (); + breakpoint_re_set (); } @@ -7264,11 +7228,6 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch, "tracepoint marker to probe")); } - if (enabled && b->pspace->executing_startup - && (b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint)) - b->enable_state = bp_startup_disabled; - loc = b->loc; } else @@ -7991,11 +7950,6 @@ create_breakpoint (struct gdbarch *gdbarch, b->pspace = current_program_space; b->py_bp_object = NULL; - if (enabled && b->pspace->executing_startup - && (b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint)) - b->enable_state = bp_startup_disabled; - if (!internal) /* Do not mention breakpoints with a negative number, but do notify observers. */ @@ -10664,11 +10618,7 @@ update_global_location_list (int should_insert) struct breakpoint *b = loc->owner; struct bp_location **loc_first_p; - if (b->enable_state == bp_disabled - || b->enable_state == bp_call_disabled - || b->enable_state == bp_startup_disabled - || !loc->enabled - || loc->shlib_disabled + if (!should_be_inserted (loc) || !breakpoint_address_is_meaningful (b) /* Don't detect duplicate for tracepoint locations because they are never duplicated. See the comments in field `duplicate' of @@ -10954,8 +10904,7 @@ static struct breakpoint_ops base_breakpoint_ops = static void bkpt_re_set (struct breakpoint *b) { - /* Do not attempt to re-set breakpoints disabled during startup. */ - if (b->enable_state == bp_startup_disabled) + if (current_program_space->executing_startup) return; /* FIXME: is this still reachable? */ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 506ae80..7a8b4de 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -186,14 +186,6 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another eventpoint). */ - bp_startup_disabled, /* The eventpoint has been disabled during - inferior startup. This is necessary on - some targets where the main executable - will get relocated during startup, making - breakpoint addresses invalid. The - eventpoint will be automatically enabled - and reset once inferior startup is - complete. */ bp_permanent /* There is a breakpoint instruction hard-wired into the target's code. Don't try to write another breakpoint -- 1.7.6.4