diff options
author | Pedro Alves <palves@redhat.com> | 2017-09-04 17:10:13 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-09-04 17:11:45 +0100 |
commit | 51abb421302bdd86946827727aebc878b5c756e3 (patch) | |
tree | a858a4e92e66d7dd3e4e196215a422b8756f9e10 /gdb/infrun.c | |
parent | 6c5b2ebeacc2538cf342cfd13c4c98ff018e6c9a (diff) | |
download | gdb-51abb421302bdd86946827727aebc878b5c756e3.zip gdb-51abb421302bdd86946827727aebc878b5c756e3.tar.gz gdb-51abb421302bdd86946827727aebc878b5c756e3.tar.bz2 |
Kill init_sal
Instead, make symtab_and_line initialize its members itself. Many
symtab_and_line declarations are moved to where the object is
initialized at the same time both for clarity and to avoid double
initialization. A few functions, like e.g., find_frame_sal are
adjusted to return the sal using normal function return instead of an
output parameter likewise to avoid having to default-construct a sal
and then immediately have the object overwritten.
gdb/ChangeLog:
2017-09-04 Pedro Alves <palves@redhat.com>
* ada-lang.c (is_known_support_routine): Move sal declaration to
where it is initialized.
* breakpoint.c (create_internal_breakpoint, init_catchpoint)
(parse_breakpoint_sals, decode_static_tracepoint_spec)
(clear_command, update_static_tracepoint): Remove init_sal
references. Move declarations closer to initializations.
* cli/cli-cmds.c (list_command): Move sal declarations closer to
initializations.
* elfread.c (elf_gnu_ifunc_resolver_stop): Remove init_sal
references. Move sal declarations closer to initializations.
* frame.c (find_frame_sal): Return a symtab_and_line via function
return instead of output parameter. Remove init_sal references.
* frame.h (find_frame_sal): Return a symtab_and_line via function
return instead of output parameter.
* guile/scm-frame.c (gdbscm_frame_sal): Adjust.
* guile/scm-symtab.c (stscm_make_sal_smob): Use in-place new
instead of memset.
(gdbscm_find_pc_line): Remove init_sal reference.
* infcall.c (call_function_by_hand_dummy): Remove init_sal
references. Move declarations closer to initializations.
* infcmd.c (set_step_frame): Update. Move declarations closer to
initializations.
(finish_backward): Remove init_sal references. Move declarations
closer to initializations.
* infrun.c (process_event_stop_test, handle_step_into_function)
(insert_hp_step_resume_breakpoint_at_frame)
(insert_step_resume_breakpoint_at_caller): Likewise.
* linespec.c (create_sals_line_offset, decode_digits_ordinary)
(symbol_to_sal): Likewise.
* probe.c (parse_probes_in_pspace): Remove init_sal reference.
* python/py-frame.c (frapy_find_sal): Move sal declaration closer
to its initialization.
* reverse.c (save_bookmark_command): Use new/delete. Remove
init_sal references. Move declarations closer to initializations.
* source.c (get_current_source_symtab_and_line): Remove brace
initialization.
(set_current_source_symtab_and_line): Now takes the sal by const
reference. Remove brace initialization.
(line_info): Remove init_sal reference.
* source.h (set_current_source_symtab_and_line): Now takes a
symtab_and_line via const reference.
* stack.c (set_current_sal_from_frame): Adjust.
(print_frame_info): Adjust.
(get_last_displayed_sal): Return the sal via function return
instead of via output parameter. Simplify.
(frame_info): Adjust.
* stack.h (get_last_displayed_sal): Return the sal via function
return instead of via output parameter.
* symtab.c (init_sal): Delete.
(find_pc_sect_line): Remove init_sal references. Move
declarations closer to initializations.
(find_function_start_sal): Remove init_sal references. Move
declarations closer to initializations.
* symtab.h (struct symtab_and_line): In-class initialize all
fields.
* tracepoint.c (set_traceframe_context)
(print_one_static_tracepoint_marker): Remove init_sal references.
Move declarations closer to initializations.
* tui/tui-disasm.c (tui_show_disassem_and_update_source): Adjust.
* tui/tui-stack.c (tui_show_frame_info): Adjust. Move
declarations closer to initializations.
* tui/tui-winsource.c (tui_update_source_window_as_is): Remove
init_sal references. Adjust.
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r-- | gdb/infrun.c | 52 |
1 files changed, 15 insertions, 37 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 06b45b4..7568a5e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6558,9 +6558,7 @@ process_event_stop_test (struct execution_control_state *ecs) { /* Set up a step-resume breakpoint at the address indicated by SKIP_SOLIB_RESOLVER. */ - struct symtab_and_line sr_sal; - - init_sal (&sr_sal); + symtab_and_line sr_sal; sr_sal.pc = pc_after_resolver; sr_sal.pspace = get_frame_program_space (frame); @@ -6611,9 +6609,7 @@ process_event_stop_test (struct execution_control_state *ecs) if (real_stop_pc) { /* And put the step-breakpoint there and go until there. */ - struct symtab_and_line sr_sal; - - init_sal (&sr_sal); /* initialize to zeroes */ + symtab_and_line sr_sal; sr_sal.pc = real_stop_pc; sr_sal.section = find_pc_overlay (sr_sal.pc); sr_sal.pspace = get_frame_program_space (frame); @@ -6711,10 +6707,8 @@ process_event_stop_test (struct execution_control_state *ecs) to the caller. */ if (ecs->stop_func_start != stop_pc && ecs->stop_func_start != 0) { - struct symtab_and_line sr_sal; - /* Normal function call return (static or dynamic). */ - init_sal (&sr_sal); + symtab_and_line sr_sal; sr_sal.pc = ecs->stop_func_start; sr_sal.pspace = get_frame_program_space (frame); insert_step_resume_breakpoint_at_sal (gdbarch, @@ -6741,9 +6735,7 @@ process_event_stop_test (struct execution_control_state *ecs) if (real_stop_pc != 0 && in_solib_dynsym_resolve_code (real_stop_pc)) { - struct symtab_and_line sr_sal; - - init_sal (&sr_sal); + symtab_and_line sr_sal; sr_sal.pc = ecs->stop_func_start; sr_sal.pspace = get_frame_program_space (frame); @@ -6797,9 +6789,7 @@ process_event_stop_test (struct execution_control_state *ecs) { /* Set a breakpoint at callee's start address. From there we can step once and be back in the caller. */ - struct symtab_and_line sr_sal; - - init_sal (&sr_sal); + symtab_and_line sr_sal; sr_sal.pc = ecs->stop_func_start; sr_sal.pspace = get_frame_program_space (frame); insert_step_resume_breakpoint_at_sal (gdbarch, @@ -6837,9 +6827,7 @@ process_event_stop_test (struct execution_control_state *ecs) /* Stepped backward into the solib dynsym resolver. Set a breakpoint at its start and continue, then one more step will take us out. */ - struct symtab_and_line sr_sal; - - init_sal (&sr_sal); + symtab_and_line sr_sal; sr_sal.pc = ecs->stop_func_start; sr_sal.pspace = get_frame_program_space (frame); insert_step_resume_breakpoint_at_sal (gdbarch, @@ -6919,13 +6907,11 @@ process_event_stop_test (struct execution_control_state *ecs) ecs->event_thread->control.step_frame_id) && inline_skipped_frames (ecs->ptid)) { - struct symtab_and_line call_sal; - if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: stepped into inlined function\n"); - find_frame_sal (get_current_frame (), &call_sal); + symtab_and_line call_sal = find_frame_sal (get_current_frame ()); if (ecs->event_thread->control.step_over_calls != STEP_OVER_ALL) { @@ -7289,17 +7275,14 @@ static void handle_step_into_function (struct gdbarch *gdbarch, struct execution_control_state *ecs) { - struct compunit_symtab *cust; - struct symtab_and_line stop_func_sal, sr_sal; - fill_in_stop_func (gdbarch, ecs); - cust = find_pc_compunit_symtab (stop_pc); + compunit_symtab *cust = find_pc_compunit_symtab (stop_pc); if (cust != NULL && compunit_language (cust) != language_asm) ecs->stop_func_start = gdbarch_skip_prologue_noexcept (gdbarch, ecs->stop_func_start); - stop_func_sal = find_pc_line (ecs->stop_func_start, 0); + symtab_and_line stop_func_sal = find_pc_line (ecs->stop_func_start, 0); /* Use the step_resume_break to step until the end of the prologue, even if that involves jumps (as it seems to on the vax under 4.2). */ @@ -7343,7 +7326,7 @@ handle_step_into_function (struct gdbarch *gdbarch, else { /* Put the step-breakpoint there and go until there. */ - init_sal (&sr_sal); /* initialize to zeroes */ + symtab_and_line sr_sal; sr_sal.pc = ecs->stop_func_start; sr_sal.section = find_pc_overlay (ecs->stop_func_start); sr_sal.pspace = get_frame_program_space (get_current_frame ()); @@ -7442,13 +7425,11 @@ insert_step_resume_breakpoint_at_sal (struct gdbarch *gdbarch, static void insert_hp_step_resume_breakpoint_at_frame (struct frame_info *return_frame) { - struct symtab_and_line sr_sal; - struct gdbarch *gdbarch; - gdb_assert (return_frame != NULL); - init_sal (&sr_sal); /* initialize to zeros */ - gdbarch = get_frame_arch (return_frame); + struct gdbarch *gdbarch = get_frame_arch (return_frame); + + symtab_and_line sr_sal; sr_sal.pc = gdbarch_addr_bits_remove (gdbarch, get_frame_pc (return_frame)); sr_sal.section = find_pc_overlay (sr_sal.pc); sr_sal.pspace = get_frame_program_space (return_frame); @@ -7475,16 +7456,13 @@ insert_hp_step_resume_breakpoint_at_frame (struct frame_info *return_frame) static void insert_step_resume_breakpoint_at_caller (struct frame_info *next_frame) { - struct symtab_and_line sr_sal; - struct gdbarch *gdbarch; - /* We shouldn't have gotten here if we don't know where the call site is. */ gdb_assert (frame_id_p (frame_unwind_caller_id (next_frame))); - init_sal (&sr_sal); /* initialize to zeros */ + struct gdbarch *gdbarch = frame_unwind_caller_arch (next_frame); - gdbarch = frame_unwind_caller_arch (next_frame); + symtab_and_line sr_sal; sr_sal.pc = gdbarch_addr_bits_remove (gdbarch, frame_unwind_caller_pc (next_frame)); sr_sal.section = find_pc_overlay (sr_sal.pc); |