diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-03-09 16:20:42 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-03-09 16:20:42 +0000 |
| commit | 569631c6f2476cccd5cd4a08986764252d236b45 (patch) | |
| tree | c48146c85656dbacdd6f830973db9aa576f47cc9 /gdb | |
| parent | 47b67b6080c44cfa45aab70b9966da28908c1021 (diff) | |
| download | gdb-569631c6f2476cccd5cd4a08986764252d236b45.zip gdb-569631c6f2476cccd5cd4a08986764252d236b45.tar.gz gdb-569631c6f2476cccd5cd4a08986764252d236b45.tar.bz2 | |
* infrun.c (breakpoints_failed): Remove unnecessary variable.
(handle_inferior_event): Remove unnecessary braces.
* breakpoint.c (bpstat_what): Remove wrong comment.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/infrun.c | 14 |
3 files changed, 10 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 563d665..9ecaaff 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2007-03-09 Markus Deuling <deuling@de.ibm.com> + + * infrun.c (breakpoints_failed): Remove unnecessary variable. + (handle_inferior_event): Remove unnecessary braces. + * breakpoint.c (bpstat_what): Remove wrong comment. + 2007-03-09 Ulrich Weigand <uweigand@de.ibm.com> * spu-tdep.c (spu_in_function_epilogue_p): New function. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index aebd95d..abefcdc 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3134,8 +3134,6 @@ bpstat_what (bpstat bs) /* step_resume entries: a step resume breakpoint overrides another breakpoint of signal handling (see comment in wait_for_inferior at where we set the step_resume breakpoint). */ - /* We handle the through_sigtramp_breakpoint the same way; having both - one of those and a step_resume_breakpoint is probably very rare (?). */ static const enum bpstat_what_main_action table[(int) class_last][(int) BPSTAT_WHAT_LAST] = diff --git a/gdb/infrun.c b/gdb/infrun.c index 5d03619..0bea6a9 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -288,10 +288,6 @@ int proceed_to_finish; struct regcache *stop_registers; -/* Nonzero if program stopped due to error trying to insert breakpoints. */ - -static int breakpoints_failed; - /* Nonzero after stop if current stack frame should be printed. */ static int stop_print_frame; @@ -1830,7 +1826,6 @@ handle_inferior_event (struct execution_control_state *ecs) stop_print_frame = 1; ecs->random_signal = 0; stopped_by_random_signal = 0; - breakpoints_failed = 0; if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected @@ -2126,9 +2121,7 @@ process_event_stop_test: if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_SINGLE\n"); if (breakpoints_inserted) - { - remove_breakpoints (); - } + remove_breakpoints (); breakpoints_inserted = 0; ecs->another_trap = 1; /* Still need to check other stuff, at least the case @@ -2909,8 +2902,9 @@ keep_going (struct execution_control_state *ecs) if (!breakpoints_inserted && !ecs->another_trap) { - breakpoints_failed = insert_breakpoints (); - if (breakpoints_failed) + /* Stop stepping when inserting breakpoints + has failed. */ + if (insert_breakpoints () != 0) { stop_stepping (ecs); return; |