diff options
author | Michael Snyder <msnyder@specifix.com> | 2008-10-06 23:52:33 +0000 |
---|---|---|
committer | Michael Snyder <msnyder@specifix.com> | 2008-10-06 23:52:33 +0000 |
commit | a136fe8deab4e455a910c3c930c9a8aa48ce1b03 (patch) | |
tree | 4ab00119e0f7011b049d89a3c3f1518134d6018b /gdb/infcmd.c | |
parent | 7bc90c29e0fc058a50dfa120197470545fd85705 (diff) | |
download | gdb-a136fe8deab4e455a910c3c930c9a8aa48ce1b03.tar.gz |
2008-10-06 Michael Snyder <msnyder@vmware.com>
* infcmd.c: Minor function reordering.
Diffstat (limited to 'gdb/infcmd.c')
-rw-r--r-- | gdb/infcmd.c | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 0d982c96840..47c91e96034 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1415,11 +1415,70 @@ finish_command_continuation_free_arg (void *arg) xfree (arg); } +/* finish_backward -- helper function for finish_command. */ + +static void +finish_backward (struct symbol *function) +{ + struct symtab_and_line sal; + struct breakpoint *breakpoint; + struct cleanup *old_chain; + CORE_ADDR func_addr; + int back_up; + + if (find_pc_partial_function (get_frame_pc (get_current_frame ()), + NULL, &func_addr, NULL) == 0) + internal_error (__FILE__, __LINE__, + "Finish: couldn't find function."); + + sal = find_pc_line (func_addr, 0); + + /* Let's cheat and not worry about async until later. */ + + /* We don't need a return value. */ + proceed_to_finish = 0; + /* Special case: if we're sitting at the function entry point, + then all we need to do is take a reverse singlestep. We + don't need to set a breakpoint, and indeed it would do us + no good to do so. + + Note that this can only happen at frame #0, since there's + no way that a function up the stack can have a return address + that's equal to its entry point. */ + + if (sal.pc != read_pc ()) + { + /* Set breakpoint and continue. */ + breakpoint = + set_momentary_breakpoint (sal, + get_frame_id (get_selected_frame (NULL)), + bp_breakpoint); + /* Tell the breakpoint to keep quiet. We won't be done + until we've done another reverse single-step. */ + breakpoint_silence (breakpoint); + old_chain = make_cleanup_delete_breakpoint (breakpoint); + proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0); + /* We will be stopped when proceed returns. */ + back_up = bpstat_find_breakpoint (stop_bpstat, breakpoint) != NULL; + do_cleanups (old_chain); + } + else + back_up = 1; + if (back_up) + { + /* If in fact we hit the step-resume breakpoint (and not + some other breakpoint), then we're almost there -- + we just need to back up by one more single-step. */ + /* (Kludgy way of letting wait_for_inferior know...) */ + step_range_start = step_range_end = 1; + proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 1); + } + return; +} + /* "finish": Set a temporary breakpoint at the place the selected frame will return to, then continue. */ -static void finish_backwards (struct symbol *); - static void finish_command (char *arg, int from_tty) { @@ -1479,7 +1538,7 @@ finish_command (char *arg, int from_tty) if (target_get_execution_direction () == EXEC_REVERSE) { /* Split off at this point. */ - finish_backwards (function); + finish_backward (function); return; } @@ -1556,65 +1615,6 @@ Type \"info stack\" or \"info registers\" for more information.\n")); } } -static void -finish_backwards (struct symbol *function) -{ - struct symtab_and_line sal; - struct breakpoint *breakpoint; - struct cleanup *old_chain; - CORE_ADDR func_addr; - int back_up; - - if (find_pc_partial_function (get_frame_pc (get_current_frame ()), - NULL, &func_addr, NULL) == 0) - internal_error (__FILE__, __LINE__, - "Finish: couldn't find function."); - - sal = find_pc_line (func_addr, 0); - - /* Let's cheat and not worry about async until later. */ - - /* We don't need a return value. */ - proceed_to_finish = 0; - /* Special case: if we're sitting at the function entry point, - then all we need to do is take a reverse singlestep. We - don't need to set a breakpoint, and indeed it would do us - no good to do so. - - Note that this can only happen at frame #0, since there's - no way that a function up the stack can have a return address - that's equal to its entry point. */ - - if (sal.pc != read_pc ()) - { - /* Set breakpoint and continue. */ - breakpoint = - set_momentary_breakpoint (sal, - get_frame_id (get_selected_frame (NULL)), - bp_breakpoint); - /* Tell the breakpoint to keep quiet. We won't be done - until we've done another reverse single-step. */ - breakpoint_silence (breakpoint); - old_chain = make_cleanup_delete_breakpoint (breakpoint); - proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0); - /* We will be stopped when proceed returns. */ - back_up = bpstat_find_breakpoint (stop_bpstat, breakpoint) != NULL; - do_cleanups (old_chain); - } - else - back_up = 1; - if (back_up) - { - /* If in fact we hit the step-resume breakpoint (and not - some other breakpoint), then we're almost there -- - we just need to back up by one more single-step. */ - /* (Kludgy way of letting wait_for_inferior know...) */ - step_range_start = step_range_end = 1; - proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 1); - } - return; -} - static void environment_info (char *var, int from_tty) |