FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* breakpoint.h (enum bpstat_what_main_action): Delete

Browse source 
BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE.

	* breakpoint.c (clrs): Delete.
	(bpstat_what): Update table.

	* infrun.c (handle_inferior_event): Remove
	BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE handling.
This commit is contained in:
Pedro Alves 2008-04-25 14:50:10 +00:00
parent bd0cc3f7be
commit 78b6a73194
4 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gdb/ChangeLog
View file

@ -1,3 +1,14 @@
2008-04-25 Pedro Alves <pedro@codesourcery.com>
* breakpoint.h (enum bpstat_what_main_action): Delete
BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE.
* breakpoint.c (clrs): Delete.
(bpstat_what): Update table.
* infrun.c (handle_inferior_event): Remove
BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE handling.
2008-04-24 Vladimir Prus <vladimir@codesourcery.com> 2008-04-24 Vladimir Prus <vladimir@codesourcery.com>
* mi/mi-cmds.h (mi_cmd_args_ftype): Remove. * mi/mi-cmds.h (mi_cmd_args_ftype): Remove.

35
gdb/breakpoint.c
View file

@ -3173,7 +3173,6 @@ bpstat_what (bpstat bs)
#define sgl BPSTAT_WHAT_SINGLE #define sgl BPSTAT_WHAT_SINGLE
#define slr BPSTAT_WHAT_SET_LONGJMP_RESUME #define slr BPSTAT_WHAT_SET_LONGJMP_RESUME
#define clr BPSTAT_WHAT_CLEAR_LONGJMP_RESUME #define clr BPSTAT_WHAT_CLEAR_LONGJMP_RESUME
#define clrs BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE
#define sr BPSTAT_WHAT_STEP_RESUME #define sr BPSTAT_WHAT_STEP_RESUME
#define shl BPSTAT_WHAT_CHECK_SHLIBS #define shl BPSTAT_WHAT_CHECK_SHLIBS
#define shlr BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK #define shlr BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK
@ -3198,10 +3197,9 @@ bpstat_what (bpstat bs)
ordering is: ordering is:
kc < clr sgl shl shlr slr sn sr ss kc < clr sgl shl shlr slr sn sr ss
sgl < clrs shl shlr slr sn sr ss sgl < shl shlr slr sn sr ss
slr < err shl shlr sn sr ss slr < err shl shlr sn sr ss
clr < clrs err shl shlr sn sr ss clr < err shl shlr sn sr ss
clrs < err shl shlr sn sr ss
ss < shl shlr sn sr ss < shl shlr sn sr
sn < shl shlr sr sn < shl shlr sr
shl < shlr sr shl < shlr sr
@ -3212,9 +3210,7 @@ bpstat_what (bpstat bs)
here. If you just put the rows and columns in the right order, here. If you just put the rows and columns in the right order,
it'd look awfully regular. We could simply walk the bpstat list it'd look awfully regular. We could simply walk the bpstat list
and choose the highest priority action we find, with a little and choose the highest priority action we find, with a little
logic to handle the 'err' cases, and the CLEAR_LONGJMP_RESUME/ logic to handle the 'err' cases. */
CLEAR_LONGJMP_RESUME_SINGLE distinction (which breakpoint.h says
is messy anyway). */
/* step_resume entries: a step resume breakpoint overrides another /* step_resume entries: a step resume breakpoint overrides another
breakpoint of signal handling (see comment in wait_for_inferior breakpoint of signal handling (see comment in wait_for_inferior
@ -3224,30 +3220,30 @@ bpstat_what (bpstat bs)
table[(int) class_last][(int) BPSTAT_WHAT_LAST] = table[(int) class_last][(int) BPSTAT_WHAT_LAST] =
{ {
/* old action */ /* old action */
/* kc ss sn sgl slr clr clrs sr shl shlr /* kc ss sn sgl slr clr sr shl shlr
*/ */
/*no_effect */ /*no_effect */
{kc, ss, sn, sgl, slr, clr, clrs, sr, shl, shlr}, {kc, ss, sn, sgl, slr, clr, sr, shl, shlr},
/*wp_silent */ /*wp_silent */
{ss, ss, sn, ss, ss, ss, ss, sr, shl, shlr}, {ss, ss, sn, ss, ss, ss, sr, shl, shlr},
/*wp_noisy */ /*wp_noisy */
{sn, sn, sn, sn, sn, sn, sn, sr, shl, shlr}, {sn, sn, sn, sn, sn, sn, sr, shl, shlr},
/*bp_nostop */ /*bp_nostop */
{sgl, ss, sn, sgl, slr, clrs, clrs, sr, shl, shlr}, {sgl, ss, sn, sgl, slr, slr, sr, shl, shlr},
/*bp_silent */ /*bp_silent */
{ss, ss, sn, ss, ss, ss, ss, sr, shl, shlr}, {ss, ss, sn, ss, ss, ss, sr, shl, shlr},
/*bp_noisy */ /*bp_noisy */
{sn, sn, sn, sn, sn, sn, sn, sr, shl, shlr}, {sn, sn, sn, sn, sn, sn, sr, shl, shlr},
/*long_jump */ /*long_jump */
{slr, ss, sn, slr, slr, err, err, sr, shl, shlr}, {slr, ss, sn, slr, slr, err, sr, shl, shlr},
/*long_resume */ /*long_resume */
{clr, ss, sn, clrs, err, err, err, sr, shl, shlr}, {clr, ss, sn, err, err, err, sr, shl, shlr},
/*step_resume */ /*step_resume */
{sr, sr, sr, sr, sr, sr, sr, sr, sr, sr}, {sr, sr, sr, sr, sr, sr, sr, sr, sr},
/*shlib */ /*shlib */
{shl, shl, shl, shl, shl, shl, shl, sr, shl, shlr}, {shl, shl, shl, shl, shl, shl, sr, shl, shlr},
/*catch_shlib */ /*catch_shlib */
{shlr, shlr, shlr, shlr, shlr, shlr, shlr, sr, shlr, shlr} {shlr, shlr, shlr, shlr, shlr, shlr, sr, shlr, shlr}
}; };
#undef kc #undef kc
@ -3256,7 +3252,6 @@ bpstat_what (bpstat bs)
#undef sgl #undef sgl
#undef slr #undef slr
#undef clr #undef clr
#undef clrs
#undef err #undef err
#undef sr #undef sr
#undef ts #undef ts

3
gdb/breakpoint.h
View file

@ -516,9 +516,6 @@ enum bpstat_what_main_action
BPSTAT_WHAT_KEEP_CHECKING. */ BPSTAT_WHAT_KEEP_CHECKING. */
BPSTAT_WHAT_CLEAR_LONGJMP_RESUME, 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. */ /* Clear step resume breakpoint, and keep checking. */
BPSTAT_WHAT_STEP_RESUME, BPSTAT_WHAT_STEP_RESUME,

5
gdb/infrun.c
View file

@ -2131,14 +2131,11 @@ process_event_stop_test:
return; return;
case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME: case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME:
case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE:
if (debug_infrun) if (debug_infrun)
fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_CLEAR_LONGJMP_RESUME\n"); fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_CLEAR_LONGJMP_RESUME\n");
disable_longjmp_breakpoint (); disable_longjmp_breakpoint ();
ecs->handling_longjmp = 0; /* FIXME */ ecs->handling_longjmp = 0; /* FIXME */
if (what.main_action == BPSTAT_WHAT_CLEAR_LONGJMP_RESUME) break;
break;
/* else fallthrough */
case BPSTAT_WHAT_SINGLE: case BPSTAT_WHAT_SINGLE:
if (debug_infrun) if (debug_infrun)