diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2007-02-27 19:46:04 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2007-02-27 19:46:04 +0000 |
| commit | 2dc3ea4026aefe3cef284e14e1d6c3dc94f62236 (patch) | |
| tree | 8a3d120691ace42ecd7c75ad7503a0205c611252 /gdb/macroscope.c | |
| parent | afc5ea053e931de49a35f76bd001fa17b4aa7b5c (diff) | |
| download | gdb-2dc3ea4026aefe3cef284e14e1d6c3dc94f62236.tar.gz | |
* frame.c (deprecated_selected_frame): Rename to...
(selected_frame): ...this. Make static.
(get_selected_frame, select_frame): Update.
* frame.h (deprected_select_frame): Delete.
(deprecated_safe_get_selected_frame): Update comments.
* breakpoint.c, cli/cli-cmds.c, f-valprint.c, infcmd.c, inflow.c,
infrun.c, stack.c, tui/tui-disasm.c, tui/tui-source.c,
tui/tui-winsource.c, valops.c, varobj.c, findvar.c, macroscope.c,
parse.c, regcache.h, sh64-tdep.c, tui/tui-hooks.c, tui/tui-win.c,
tui/tui.c: Replace references to deprecated_selected_frame.
Diffstat (limited to 'gdb/macroscope.c')
| -rw-r--r-- | gdb/macroscope.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gdb/macroscope.c b/gdb/macroscope.c index d90e075f496..569a9e93891 100644 --- a/gdb/macroscope.c +++ b/gdb/macroscope.c @@ -84,17 +84,14 @@ default_macro_scope (void) { struct symtab_and_line sal; struct macro_scope *ms; + struct frame_info *frame; - /* If there's a selected frame, use its PC. */ - if (deprecated_selected_frame) - sal = find_pc_line (get_frame_pc (deprecated_selected_frame), 0); + /* If there's a selected frame, use its PC. */ + frame = deprecated_safe_get_selected_frame (); + if (frame) + sal = find_pc_line (get_frame_pc (frame), 0); - /* If the target has any registers at all, then use its PC. Why we - would have registers but no stack, I'm not sure. */ - else if (target_has_registers) - sal = find_pc_line (read_pc (), 0); - - /* If all else fails, fall back to the current listing position. */ + /* Fall back to the current listing position. */ else { /* Don't call select_source_symtab here. That can raise an |