From 1596060827823b9bd8095f4275e5f7858bfc4b89 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 10 May 2004 23:27:49 +0000 Subject: [PATCH] 2004-05-10 Andrew Cagney * infrun.c (through_sigtramp_breakpoint): Delete variable. (context_switch): Do not switch through_sigtramp_breakpoint. * gdbthread.h (save_infrun_state, load_infrun_state) (struct thread_info): Delete through_sigtramp_breakpoint parameter and structure member. * thread.c (load_infrun_state, save_infrun_state): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/gdbthread.h | 3 --- gdb/infrun.c | 7 ++----- gdb/thread.c | 4 ---- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 56f604791b..33ac737012 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2004-05-10 Andrew Cagney + + * infrun.c (through_sigtramp_breakpoint): Delete variable. + (context_switch): Do not switch through_sigtramp_breakpoint. + * gdbthread.h (save_infrun_state, load_infrun_state) + (struct thread_info): Delete through_sigtramp_breakpoint parameter + and structure member. + * thread.c (load_infrun_state, save_infrun_state): Update. + 2004-05-10 Mark Kettenis * m68kbsd-tdep.c (m68kbsd_elf_init_abi): Call m68k_svr4_init_abi. diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 09dea26ca8..d93dbef430 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -45,7 +45,6 @@ struct thread_info /* State from wait_for_inferior */ CORE_ADDR prev_pc; struct breakpoint *step_resume_breakpoint; - struct breakpoint *through_sigtramp_breakpoint; CORE_ADDR step_range_start; CORE_ADDR step_range_end; struct frame_id step_frame_id; @@ -118,7 +117,6 @@ extern void save_infrun_state (ptid_t ptid, CORE_ADDR prev_pc, int trap_expected, struct breakpoint *step_resume_breakpoint, - struct breakpoint *through_sigtramp_breakpoint, CORE_ADDR step_range_start, CORE_ADDR step_range_end, const struct frame_id *step_frame_id, @@ -137,7 +135,6 @@ extern void load_infrun_state (ptid_t ptid, CORE_ADDR *prev_pc, int *trap_expected, struct breakpoint **step_resume_breakpoint, - struct breakpoint **through_sigtramp_breakpoint, CORE_ADDR *step_range_start, CORE_ADDR *step_range_end, struct frame_id *step_frame_id, diff --git a/gdb/infrun.c b/gdb/infrun.c index 79e681c944..298b5f4250 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -303,9 +303,6 @@ static int breakpoints_failed; static int stop_print_frame; static struct breakpoint *step_resume_breakpoint = NULL; -/* NOTE: cagney/2004-05-08: This variable needs to be garbage - collected, it isn't used. */ -static struct breakpoint *through_sigtramp_breakpoint = NULL; /* On some platforms (e.g., HP-UX), hardware watchpoints have bad interactions with an inferior that is running a kernel function @@ -1159,7 +1156,7 @@ context_switch (struct execution_control_state *ecs) /* Save infrun state for the old thread. */ save_infrun_state (inferior_ptid, prev_pc, trap_expected, step_resume_breakpoint, - through_sigtramp_breakpoint, step_range_start, + step_range_start, step_range_end, &step_frame_id, ecs->handling_longjmp, ecs->another_trap, ecs->stepping_through_solib_after_catch, @@ -1170,7 +1167,7 @@ context_switch (struct execution_control_state *ecs) /* Load infrun state for the new thread. */ load_infrun_state (ecs->ptid, &prev_pc, &trap_expected, &step_resume_breakpoint, - &through_sigtramp_breakpoint, &step_range_start, + &step_range_start, &step_range_end, &step_frame_id, &ecs->handling_longjmp, &ecs->another_trap, &ecs->stepping_through_solib_after_catch, diff --git a/gdb/thread.c b/gdb/thread.c index 35ba2b14a1..bb7c63fbec 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -294,7 +294,6 @@ load_infrun_state (ptid_t ptid, CORE_ADDR *prev_pc, int *trap_expected, struct breakpoint **step_resume_breakpoint, - struct breakpoint **through_sigtramp_breakpoint, CORE_ADDR *step_range_start, CORE_ADDR *step_range_end, struct frame_id *step_frame_id, @@ -317,7 +316,6 @@ load_infrun_state (ptid_t ptid, *prev_pc = tp->prev_pc; *trap_expected = tp->trap_expected; *step_resume_breakpoint = tp->step_resume_breakpoint; - *through_sigtramp_breakpoint = tp->through_sigtramp_breakpoint; *step_range_start = tp->step_range_start; *step_range_end = tp->step_range_end; *step_frame_id = tp->step_frame_id; @@ -340,7 +338,6 @@ save_infrun_state (ptid_t ptid, CORE_ADDR prev_pc, int trap_expected, struct breakpoint *step_resume_breakpoint, - struct breakpoint *through_sigtramp_breakpoint, CORE_ADDR step_range_start, CORE_ADDR step_range_end, const struct frame_id *step_frame_id, @@ -363,7 +360,6 @@ save_infrun_state (ptid_t ptid, tp->prev_pc = prev_pc; tp->trap_expected = trap_expected; tp->step_resume_breakpoint = step_resume_breakpoint; - tp->through_sigtramp_breakpoint = through_sigtramp_breakpoint; tp->step_range_start = step_range_start; tp->step_range_end = step_range_end; tp->step_frame_id = (*step_frame_id);