From 629a41eeaee0f807d2652e83f23aa3ab3022bc0e Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 25 Aug 2004 15:18:05 +0000 Subject: [PATCH] 2004-08-25 Andrew Cagney * infrun.c (struct execution_control_state): Delete field "stepping_through_sigtramp". (init_execution_control_state): Do not set same. (context_switch): Do not pass same to save_infrun_state and load_infrun_state. * gdbthread.h (struct thread_info): Delete field stepping_through_sigtramp. (save_infrun_state, load_infrun_state): Delete parameter stepping_through_sigtramp. * thread.c (load_infrun_state, save_infrun_state): Update. --- gdb/ChangeLog | 11 +++++++++++ gdb/gdbthread.h | 6 ------ gdb/infrun.c | 4 ---- gdb/thread.c | 4 ---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3014c58d971..90ebbe525a2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2004-08-25 Andrew Cagney + * infrun.c (struct execution_control_state): Delete field + "stepping_through_sigtramp". + (init_execution_control_state): Do not set same. + (context_switch): Do not pass same to save_infrun_state and + load_infrun_state. + * gdbthread.h (struct thread_info): Delete field + stepping_through_sigtramp. + (save_infrun_state, load_infrun_state): Delete parameter + stepping_through_sigtramp. + * thread.c (load_infrun_state, save_infrun_state): Update. + * infrun.c: Re-indent. Move expression operators to the beginning of the line. Remove long disabled #if 0 code. diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 0f8deeb8c46..c58a38eab67 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -65,10 +65,6 @@ struct thread_info when we finally do stop stepping. */ bpstat stepping_through_solib_catchpoints; - /* This is set to TRUE when this thread is in a signal handler - trampoline and we're single-stepping through it. */ - int stepping_through_sigtramp; - /* Private data used by the target vector implementation. */ struct private_thread_info *private; }; @@ -123,7 +119,6 @@ extern void save_infrun_state (ptid_t ptid, int another_trap, int stepping_through_solib_after_catch, bpstat stepping_through_solib_catchpoints, - int stepping_through_sigtramp, int current_line, struct symtab *current_symtab); @@ -140,7 +135,6 @@ extern void load_infrun_state (ptid_t ptid, int *another_trap, int *stepping_through_solib_affter_catch, bpstat *stepping_through_solib_catchpoints, - int *stepping_through_sigtramp, int *current_line, struct symtab **current_symtab); diff --git a/gdb/infrun.c b/gdb/infrun.c index b0c5eab93a5..5d0158a8a71 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -923,7 +923,6 @@ struct execution_control_state int stepping_through_solib_after_catch; bpstat stepping_through_solib_catchpoints; int enable_hw_watchpoints_after_wait; - int stepping_through_sigtramp; int new_thread_event; struct target_waitstatus tmpstatus; enum infwait_states infwait_state; @@ -1074,7 +1073,6 @@ init_execution_control_state (struct execution_control_state *ecs) ecs->stepping_through_solib_after_catch = 0; ecs->stepping_through_solib_catchpoints = NULL; ecs->enable_hw_watchpoints_after_wait = 0; - ecs->stepping_through_sigtramp = 0; ecs->sal = find_pc_line (prev_pc, 0); ecs->current_line = ecs->sal.line; ecs->current_symtab = ecs->sal.symtab; @@ -1128,7 +1126,6 @@ context_switch (struct execution_control_state *ecs) ecs->handling_longjmp, ecs->another_trap, ecs->stepping_through_solib_after_catch, ecs->stepping_through_solib_catchpoints, - ecs->stepping_through_sigtramp, ecs->current_line, ecs->current_symtab); /* Load infrun state for the new thread. */ @@ -1139,7 +1136,6 @@ context_switch (struct execution_control_state *ecs) &ecs->handling_longjmp, &ecs->another_trap, &ecs->stepping_through_solib_after_catch, &ecs->stepping_through_solib_catchpoints, - &ecs->stepping_through_sigtramp, &ecs->current_line, &ecs->current_symtab); } inferior_ptid = ecs->ptid; diff --git a/gdb/thread.c b/gdb/thread.c index 16645927720..a52395bd144 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -301,7 +301,6 @@ load_infrun_state (ptid_t ptid, int *another_trap, int *stepping_through_solib_after_catch, bpstat *stepping_through_solib_catchpoints, - int *stepping_through_sigtramp, int *current_line, struct symtab **current_symtab) { @@ -325,7 +324,6 @@ load_infrun_state (ptid_t ptid, tp->stepping_through_solib_after_catch; *stepping_through_solib_catchpoints = tp->stepping_through_solib_catchpoints; - *stepping_through_sigtramp = tp->stepping_through_sigtramp; *current_line = tp->current_line; *current_symtab = tp->current_symtab; } @@ -344,7 +342,6 @@ save_infrun_state (ptid_t ptid, int another_trap, int stepping_through_solib_after_catch, bpstat stepping_through_solib_catchpoints, - int stepping_through_sigtramp, int current_line, struct symtab *current_symtab) { @@ -366,7 +363,6 @@ save_infrun_state (ptid_t ptid, tp->another_trap = another_trap; tp->stepping_through_solib_after_catch = stepping_through_solib_after_catch; tp->stepping_through_solib_catchpoints = stepping_through_solib_catchpoints; - tp->stepping_through_sigtramp = stepping_through_sigtramp; tp->current_line = current_line; tp->current_symtab = current_symtab; }