From 8358c15c55744630cf69baf9acd134b8cc04e7c7 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 28 Nov 2010 04:33:47 +0000 Subject: gdb/ Fix step_resume_breakpoint unsaved during an infcall. * gdbthread.h (struct thread_control_state): Move here field step_resume_breakpoint ... (struct thread_info): ... from here. * infrun.c (save_infcall_control_state): Reset control.step_resume_breakpoint to NULL. (restore_infcall_control_state, discard_infcall_control_state): Delete control.step_resume_breakpoint. * arm-linux-tdep.c, infrun.c, thread.c: Update all the references to the moved field. gdb/testsuite/ Fix step_resume_breakpoint unsaved during an infcall. * gdb.base/step-resume-infcall.exp: New file. * gdb.base/step-resume-infcall.c: New file. --- gdb/gdbthread.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gdb/gdbthread.h') diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 8fe82c3..c6a1d5c 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -37,6 +37,9 @@ struct thread_control_state { /* User/external stepping state. */ + /* Step-resume or longjmp-resume breakpoint. */ + struct breakpoint *step_resume_breakpoint; + /* Range to single step within. If this is nonzero, respond to a single-step signal by continuing @@ -151,11 +154,6 @@ struct thread_info call. See `struct thread_suspend_state'. */ struct thread_suspend_state suspend; - /* User/external stepping state. */ - - /* Step-resume or longjmp-resume breakpoint. */ - struct breakpoint *step_resume_breakpoint; - int current_line; struct symtab *current_symtab; -- cgit v1.1