aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2022-07-25 14:06:35 -0300
committerBruno Larsen <blarsen@redhat.com>2022-10-10 11:57:10 +0200
commitbd2b40ac129b167f1a709589dee9c009a04a6e21 (patch)
tree675eb8430a923c94353eca0ec2e7b56cfc1eae37 /gdb/tui
parentba380b3e5162e89c4c81a73f4fb9fcbbbbe75e24 (diff)
downloadgdb-bd2b40ac129b167f1a709589dee9c009a04a6e21.zip
gdb-bd2b40ac129b167f1a709589dee9c009a04a6e21.tar.gz
gdb-bd2b40ac129b167f1a709589dee9c009a04a6e21.tar.bz2
Change GDB to use frame_info_ptr
This changes GDB to use frame_info_ptr instead of frame_info * The substitution was done with multiple sequential `sed` commands: sed 's/^struct frame_info;/class frame_info_ptr;/' sed 's/struct frame_info \*/frame_info_ptr /g' - which left some issues in a few files, that were manually fixed. sed 's/\<frame_info \*/frame_info_ptr /g' sed 's/frame_info_ptr $/frame_info_ptr/g' - used to remove whitespace problems. The changed files were then manually checked and some 'sed' changes undone, some constructors and some gets were added, according to what made sense, and what Tromey originally did Co-Authored-By: Bruno Larsen <blarsen@redhat.com> Approved-by: Tom Tomey <tom@tromey.com>
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-disasm.c2
-rw-r--r--gdb/tui/tui-disasm.h2
-rw-r--r--gdb/tui/tui-hooks.c6
-rw-r--r--gdb/tui/tui-regs.c8
-rw-r--r--gdb/tui/tui-regs.h4
-rw-r--r--gdb/tui/tui-source.c4
-rw-r--r--gdb/tui/tui-source.h2
-rw-r--r--gdb/tui/tui-stack.c4
-rw-r--r--gdb/tui/tui-stack.h4
-rw-r--r--gdb/tui/tui-winsource.c4
-rw-r--r--gdb/tui/tui-winsource.h2
11 files changed, 21 insertions, 21 deletions
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 2cb9c75..e4bbc47 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -484,7 +484,7 @@ tui_disasm_window::addr_is_displayed (CORE_ADDR addr) const
}
void
-tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal)
+tui_disasm_window::maybe_update (frame_info_ptr fi, symtab_and_line sal)
{
CORE_ADDR low;
diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
index e33c641..d9d9794 100644
--- a/gdb/tui/tui-disasm.h
+++ b/gdb/tui/tui-disasm.h
@@ -41,7 +41,7 @@ struct tui_disasm_window : public tui_source_window_base
bool location_matches_p (struct bp_location *loc, int line_no) override;
- void maybe_update (struct frame_info *fi, symtab_and_line sal) override;
+ void maybe_update (frame_info_ptr fi, symtab_and_line sal) override;
void erase_source_content () override
{
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 8317278..967ac30 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -62,9 +62,9 @@ static bool tui_refreshing_registers = false;
/* Observer for the register_changed notification. */
static void
-tui_register_changed (struct frame_info *frame, int regno)
+tui_register_changed (frame_info_ptr frame, int regno)
{
- struct frame_info *fi;
+ frame_info_ptr fi;
if (!tui_is_window_visible (DATA_WIN))
return;
@@ -129,7 +129,7 @@ tui_refresh_frame_and_register_information ()
if (from_stack && has_stack_frames ())
{
- struct frame_info *fi = get_selected_frame (NULL);
+ frame_info_ptr fi = get_selected_frame (NULL);
/* Display the frame position (even if there is no symbols or
the PC is not known). */
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 830df54..3eff98a 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -85,7 +85,7 @@ tab_expansion_file::write (const char *buf, long length_buf)
representation of it. */
static std::string
-tui_register_format (struct frame_info *frame, int regnum)
+tui_register_format (frame_info_ptr frame, int regnum)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
@@ -111,7 +111,7 @@ tui_register_format (struct frame_info *frame, int regnum)
display. When changep is set, check if the new register value has
changed with respect to the previous call. */
static void
-tui_get_register (struct frame_info *frame,
+tui_get_register (frame_info_ptr frame,
struct tui_data_item_window *data,
int regnum, bool *changedp)
{
@@ -208,7 +208,7 @@ tui_data_window::show_registers (const reggroup *group)
void
tui_data_window::show_register_group (const reggroup *group,
- struct frame_info *frame,
+ frame_info_ptr frame,
bool refresh_values_only)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
@@ -462,7 +462,7 @@ tui_data_window::do_scroll_vertical (int num_to_scroll)
given a particular frame. If the values have changed, they are
updated with the new value and highlighted. */
void
-tui_data_window::check_register_values (struct frame_info *frame)
+tui_data_window::check_register_values (frame_info_ptr frame)
{
if (m_regs_content.empty ())
show_registers (m_current_group);
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 5289d3a..fc838d3 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -59,7 +59,7 @@ struct tui_data_window : public tui_win_info
return DATA_NAME;
}
- void check_register_values (struct frame_info *frame);
+ void check_register_values (frame_info_ptr frame);
void show_registers (const reggroup *group);
@@ -101,7 +101,7 @@ private:
void display_reg_element_at_line (int start_element_no, int start_line_no);
void show_register_group (const reggroup *group,
- struct frame_info *frame,
+ frame_info_ptr frame,
bool refresh_values_only);
/* Answer the number of the last line in the regs display. If there
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 208889d..c45463e 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -140,7 +140,7 @@ tui_source_window::do_scroll_vertical (int num_to_scroll)
if (cursal.symtab == NULL)
{
- struct frame_info *fi = get_selected_frame (NULL);
+ frame_info_ptr fi = get_selected_frame (NULL);
s = find_pc_line_symtab (get_frame_pc (fi));
arch = get_frame_arch (fi);
}
@@ -191,7 +191,7 @@ tui_source_window::line_is_displayed (int line) const
}
void
-tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal)
+tui_source_window::maybe_update (frame_info_ptr fi, symtab_and_line sal)
{
int start_line = (sal.line - ((height - 2) / 2)) + 1;
if (start_line <= 0)
diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
index d2c6338..7187deb 100644
--- a/gdb/tui/tui-source.h
+++ b/gdb/tui/tui-source.h
@@ -46,7 +46,7 @@ struct tui_source_window : public tui_source_window_base
bool showing_source_p (const char *filename) const;
- void maybe_update (struct frame_info *fi, symtab_and_line sal) override;
+ void maybe_update (frame_info_ptr fi, symtab_and_line sal) override;
void erase_source_content () override
{
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index be8ffbd..85e71c0 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -195,7 +195,7 @@ tui_locator_window::make_status_line () const
name is demangled if demangling is turned on. Returns a pointer to
a static area holding the result. */
static char*
-tui_get_function_from_frame (struct frame_info *fi)
+tui_get_function_from_frame (frame_info_ptr fi)
{
static char name[256];
string_file stream;
@@ -251,7 +251,7 @@ tui_locator_window::rerender ()
subsequently refreshed), false otherwise. */
bool
-tui_show_frame_info (struct frame_info *fi)
+tui_show_frame_info (frame_info_ptr fi)
{
bool locator_changed_p;
diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h
index 971ff1d..5cb570f 100644
--- a/gdb/tui/tui-stack.h
+++ b/gdb/tui/tui-stack.h
@@ -24,7 +24,7 @@
#include "tui/tui-data.h"
-struct frame_info;
+class frame_info_ptr;
/* Locator window class. */
@@ -79,6 +79,6 @@ private:
};
extern void tui_show_locator_content (void);
-extern bool tui_show_frame_info (struct frame_info *);
+extern bool tui_show_frame_info (frame_info_ptr );
#endif /* TUI_TUI_STACK_H */
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 87b8dcf..27ac446 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -329,7 +329,7 @@ tui_source_window_base::rerender ()
{
struct symtab_and_line cursal
= get_current_source_symtab_and_line ();
- struct frame_info *frame = deprecated_safe_get_selected_frame ();
+ frame_info_ptr frame = deprecated_safe_get_selected_frame ();
struct gdbarch *gdbarch = get_frame_arch (frame);
struct symtab *s = find_pc_line_symtab (get_frame_pc (frame));
@@ -353,7 +353,7 @@ tui_source_window_base::refill ()
sal = get_current_source_symtab_and_line ();
if (sal.symtab == NULL)
{
- struct frame_info *fi = deprecated_safe_get_selected_frame ();
+ frame_info_ptr fi = deprecated_safe_get_selected_frame ();
if (fi != nullptr)
sal = find_pc_line (get_frame_pc (fi), 0);
}
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 1e4dc12..f7301aa 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -153,7 +153,7 @@ public:
/* Update the window to display the given location. Does nothing if
the location is already displayed. */
- virtual void maybe_update (struct frame_info *fi, symtab_and_line sal) = 0;
+ virtual void maybe_update (frame_info_ptr fi, symtab_and_line sal) = 0;
void update_source_window_as_is (struct gdbarch *gdbarch,
const struct symtab_and_line &sal);