/* TUI display locator.
- Copyright (C) 1998-2015 Free Software Foundation, Inc.
+ Copyright (C) 1998-2019 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
const char *procname,
int lineno, CORE_ADDR addr);
-static void tui_update_command (char *, int);
+static void tui_update_command (const char *, int);
\f
/* Create the status line to display as much information as we can on
int status_size;
int i, proc_width;
const char *pid_name;
- const char *pc_buf;
int target_width;
int pid_width;
int line_width;
- int pc_width;
- struct ui_file *pc_out;
- if (ptid_equal (inferior_ptid, null_ptid))
+ std::string pid_name_holder;
+ if (inferior_ptid == null_ptid)
pid_name = "No process";
else
- pid_name = target_pid_to_str (inferior_ptid);
+ {
+ pid_name_holder = target_pid_to_str (inferior_ptid);
+ pid_name = pid_name_holder.c_str ();
+ }
target_width = strlen (target_shortname);
if (target_width > MAX_TARGET_WIDTH)
line_width = MIN_LINE_WIDTH;
/* Translate PC address. */
- pc_out = tui_sfileopen (128);
+ string_file pc_out;
+
fputs_filtered (loc->gdbarch? paddress (loc->gdbarch, loc->addr) : "??",
- pc_out);
- pc_buf = tui_file_get_strbuf (pc_out);
- pc_width = strlen (pc_buf);
-
+ &pc_out);
+
+ const char *pc_buf = pc_out.c_str ();
+ int pc_width = pc_out.size ();
+
/* First determine the amount of proc name width we have available.
The +1 are for a space separator between fields.
The -1 are to take into account the \0 counted by sizeof. */
string[i] = ' ';
string[status_size] = (char) 0;
- ui_file_delete (pc_out);
return string;
}
tui_get_function_from_frame (struct frame_info *fi)
{
static char name[256];
- struct ui_file *stream = tui_sfileopen (256);
- char *p;
+ string_file stream;
print_address_symbolic (get_frame_arch (fi), get_frame_pc (fi),
- stream, demangle, "");
- p = tui_file_get_strbuf (stream);
+ &stream, demangle, "");
/* Use simple heuristics to isolate the function name. The symbol
can be demangled and we can have function parameters. Remove
them because the status line is too short to display them. */
- if (*p == '<')
- p++;
- strncpy (name, p, sizeof (name) - 1);
+ const char *d = stream.c_str ();
+ if (*d == '<')
+ d++;
+ strncpy (name, d, sizeof (name) - 1);
name[sizeof (name) - 1] = 0;
- p = strchr (name, '(');
+
+ char *p = strchr (name, '(');
if (!p)
p = strchr (name, '>');
if (p)
p = strchr (name, '+');
if (p)
*p = 0;
- ui_file_delete (stream);
return name;
}
locator = tui_locator_win_info_ptr ();
- if (locator != NULL && locator->handle != (WINDOW *) NULL)
+ if (locator != NULL && locator->handle != NULL)
{
struct tui_win_element *element;
waddstr (locator->handle, string);
wclrtoeol (locator->handle);
(void) wstandend (locator->handle);
- tui_refresh_win (locator);
+ locator->refresh_window ();
wmove (locator->handle, 0, 0);
xfree (string);
locator->content_in_use = TRUE;
int
tui_show_frame_info (struct frame_info *fi)
{
- struct tui_win_info *win_info;
int locator_changed_p;
- int i;
if (fi)
{
- int start_line, i;
+ int start_line;
CORE_ADDR low;
struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
int source_already_displayed;
- struct symtab_and_line sal;
CORE_ADDR pc;
- find_frame_sal (fi, &sal);
+ symtab_and_line sal = find_frame_sal (fi);
source_already_displayed = sal.symtab != 0
&& tui_source_is_displayed (symtab_to_fullname (sal.symtab));
tui_show_locator_content ();
start_line = 0;
- for (i = 0; i < (tui_source_windows ())->count; i++)
+ for (struct tui_source_window_base *win_info : tui_source_windows ())
{
union tui_which_element *item;
- win_info = (tui_source_windows ())->list[i];
-
item = &locator->content[0]->which_element;
if (win_info == TUI_SRC_WIN)
{
start_line = (item->locator.line_no -
- (win_info->generic.viewport_height / 2)) + 1;
+ (win_info->viewport_height / 2)) + 1;
if (start_line <= 0)
start_line = 1;
}
else
{
if (find_pc_partial_function (get_frame_pc (fi),
- (const char **) NULL,
- &low, (CORE_ADDR) 0) == 0)
+ NULL, &low, NULL) == 0)
{
/* There is no symbol available for current PC. There is no
safe way how to "disassemble backwards". */
else
{
l.u.line_no = item->locator.line_no;
- tui_set_is_exec_point_at (l, win_info);
+ win_info->set_is_exec_point_at (l);
}
}
else
else
{
a.u.addr = item->locator.addr;
- tui_set_is_exec_point_at (a, win_info);
+ win_info->set_is_exec_point_at (a);
}
}
}
return 0;
tui_show_locator_content ();
- for (i = 0; i < (tui_source_windows ())->count; i++)
+ for (struct tui_source_window_base *win_info : tui_source_windows ())
{
- win_info = (tui_source_windows ())->list[i];
tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
tui_update_exec_info (win_info);
}
/* Function to initialize gdb commands, for tui window stack
manipulation. */
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_tui_stack;
-
void
_initialize_tui_stack (void)
{
add_com ("update", class_tui, tui_update_command,
_("Update the source window and locator to "
- "display the current execution point.\n"));
+ "display the current execution point."));
}
/* Command to update the display with the current execution point. */
static void
-tui_update_command (char *arg, int from_tty)
+tui_update_command (const char *arg, int from_tty)
{
- char cmd[sizeof("frame 0")];
-
- strcpy (cmd, "frame 0");
- execute_command (cmd, from_tty);
+ execute_command ("frame 0", from_tty);
}
projects / deliverable / binutils-gdb.git / blobdiff