From 206415a3eac4f69d24cf872f880f554d3d43f1bb Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 27 Feb 2007 19:46:04 +0000 Subject: * 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. --- gdb/tui/tui-disasm.c | 2 +- gdb/tui/tui-hooks.c | 12 ++++++------ gdb/tui/tui-source.c | 2 +- gdb/tui/tui-win.c | 6 +++--- gdb/tui/tui-winsource.c | 2 +- gdb/tui/tui.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'gdb/tui') diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 3fce663..e7bf2d1 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -386,7 +386,7 @@ tui_vertical_disassem_scroll (enum tui_scroll_direction scroll_direction, content = (tui_win_content) TUI_DISASM_WIN->generic.content; if (cursal.symtab == (struct symtab *) NULL) - s = find_pc_symtab (get_frame_pc (deprecated_selected_frame)); + s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL))); else s = cursal.symtab; diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index 2e1f1f1..f40c528 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -132,8 +132,8 @@ tui_registers_changed_hook (void) { struct frame_info *fi; - fi = deprecated_selected_frame; - if (fi && tui_refreshing_registers == 0) + fi = get_selected_frame (NULL); + if (tui_refreshing_registers == 0) { tui_refreshing_registers = 1; #if 0 @@ -148,8 +148,8 @@ tui_register_changed_hook (int regno) { struct frame_info *fi; - fi = deprecated_selected_frame; - if (fi && tui_refreshing_registers == 0) + fi = get_selected_frame (NULL); + if (tui_refreshing_registers == 0) { tui_refreshing_registers = 1; tui_check_data_values (fi); @@ -230,7 +230,7 @@ tui_selected_frame_level_changed_hook (int level) { struct frame_info *fi; - fi = deprecated_selected_frame; + fi = get_selected_frame (NULL); /* Ensure that symbols for this frame are read in. Also, determine the source language of this frame, and switch to it if desired. */ if (fi) @@ -264,7 +264,7 @@ tui_print_frame_info_listing_hook (struct symtab *s, int line, int stopline, int noerror) { select_source_symtab (s); - tui_show_frame_info (deprecated_selected_frame); + tui_show_frame_info (get_selected_frame (NULL)); } /* Called when the target process died or is detached. diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index 385ea91..89f024e 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -338,7 +338,7 @@ tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction, struct symtab_and_line cursal = get_current_source_symtab_and_line (); if (cursal.symtab == (struct symtab *) NULL) - s = find_pc_symtab (get_frame_pc (deprecated_selected_frame)); + s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL))); else s = cursal.symtab; diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 2ed1920..9b85833 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1328,13 +1328,13 @@ make_visible_with_new_height (struct tui_win_info * win_info) tui_free_win_content (&win_info->generic); tui_update_source_window (win_info, cursal.symtab, line_or_addr, TRUE); } - else if (deprecated_selected_frame != (struct frame_info *) NULL) + else if (deprecated_safe_get_selected_frame () != NULL) { struct tui_line_or_address line; struct symtab_and_line cursal = get_current_source_symtab_and_line (); + struct frame_info *frame = deprecated_safe_get_selected_frame (); - - s = find_pc_symtab (get_frame_pc (deprecated_selected_frame)); + s = find_pc_symtab (get_frame_pc (frame)); if (win_info->generic.type == SRC_WIN) { line.loa = LOA_LINE; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 36f46b5..4431001 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -314,7 +314,7 @@ tui_horizontal_source_scroll (struct tui_win_info * win_info, struct symtab_and_line cursal = get_current_source_symtab_and_line (); if (cursal.symtab == (struct symtab *) NULL) - s = find_pc_symtab (get_frame_pc (deprecated_selected_frame)); + s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL))); else s = cursal.symtab; diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 84df832..a552f42 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -408,8 +408,8 @@ tui_enable (void) tui_setup_io (1); tui_active = 1; - if (deprecated_selected_frame) - tui_show_frame_info (deprecated_selected_frame); + if (deprecated_safe_get_selected_frame ()) + tui_show_frame_info (deprecated_safe_get_selected_frame ()); /* Restore TUI keymap. */ tui_set_key_mode (tui_current_key_mode); -- cgit v1.1