espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 03:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change tui_source_element::line to be a unique_xmalloc_ptr

Browse Source 
This changes tui_source_element::line to be a unique_xmalloc_ptr,
removing some manual memory management.

gdb/ChangeLog
2019-09-20  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.h (~tui_source_element): Remove.
	(tui_source_element): Update.
	(struct tui_source_element) <line>: Now a unique_xmalloc_ptr.
	* tui/tui-winsource.c (tui_show_source_line): Update.
	* tui/tui-source.c (tui_source_window::set_contents): Update.
	* tui/tui-disasm.c (tui_disasm_window::set_contents): Update.
This commit is contained in:
Tom Tromey
2019-07-23 15:34:40 -06:00
parent 78d5933a43
commit f14bec587f
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2019-09-20 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (~tui_source_element): Remove.
(tui_source_element): Update.
(struct tui_source_element) <line>: Now a unique_xmalloc_ptr.
* tui/tui-winsource.c (tui_show_source_line): Update.
* tui/tui-source.c (tui_source_window::set_contents): Update.
* tui/tui-disasm.c (tui_disasm_window::set_contents): Update.
2019-09-20 Tom Tromey <tom@tromey.com> 2019-09-20 Tom Tromey <tom@tromey.com>
* tui/tui-data.h (tui_clear_source_windows_detail): Don't * tui/tui-data.h (tui_clear_source_windows_detail): Don't

5
gdb/tui/tui-disasm.c
View File

@ -231,11 +231,10 @@ tui_disasm_window::set_contents (struct gdbarch *arch,
strcpy (line + insn_pos, asm_lines[i].insn); strcpy (line + insn_pos, asm_lines[i].insn);
/* Now copy the line taking the offset into account. */ /* Now copy the line taking the offset into account. */
xfree (src->line);
if (strlen (line) > offset) if (strlen (line) > offset)
src->line = xstrndup (&line[offset], line_width); src->line.reset (xstrndup (&line[offset], line_width));
else else
src->line = xstrdup (""); src->line.reset (xstrdup (""));
src->line_or_addr.loa = LOA_ADDRESS; src->line_or_addr.loa = LOA_ADDRESS;
src->line_or_addr.u.addr = asm_lines[i].addr; src->line_or_addr.u.addr = asm_lines[i].addr;

4
gdb/tui/tui-source.c
View File

@ -184,9 +184,7 @@ tui_source_window::set_contents (struct gdbarch *arch,
symtab_to_fullname (s)) == 0 symtab_to_fullname (s)) == 0
&& cur_line_no == locator->line_no); && cur_line_no == locator->line_no);
xfree (content[cur_line].line); content[cur_line].line.reset (xstrdup (text.c_str ()));
content[cur_line].line
= xstrdup (text.c_str ());
cur_line++; cur_line++;
cur_line_no++; cur_line_no++;

3
gdb/tui/tui-winsource.c
View File

@ -222,8 +222,7 @@ tui_show_source_line (struct tui_source_window_base *win_info, int lineno)
tui_set_reverse_mode (win_info->handle, true); tui_set_reverse_mode (win_info->handle, true);
wmove (win_info->handle, lineno, TUI_EXECINFO_SIZE); wmove (win_info->handle, lineno, TUI_EXECINFO_SIZE);
tui_puts (line->line, tui_puts (line->line.get (), win_info->handle);
win_info->handle);
if (line->is_exec_point) if (line->is_exec_point)
tui_set_reverse_mode (win_info->handle, false); tui_set_reverse_mode (win_info->handle, false);

10
gdb/tui/tui-winsource.h
View File

@ -54,23 +54,17 @@ struct tui_source_element
line_or_addr.u.line_no = 0; line_or_addr.u.line_no = 0;
} }
~tui_source_element ()
{
xfree (line);
}
DISABLE_COPY_AND_ASSIGN (tui_source_element); DISABLE_COPY_AND_ASSIGN (tui_source_element);
tui_source_element (tui_source_element &&other) tui_source_element (tui_source_element &&other)
: line (other.line), : line (std::move (other.line)),
line_or_addr (other.line_or_addr), line_or_addr (other.line_or_addr),
is_exec_point (other.is_exec_point), is_exec_point (other.is_exec_point),
break_mode (other.break_mode) break_mode (other.break_mode)
{ {
other.line = nullptr;
} }
char *line = nullptr; gdb::unique_xmalloc_ptr<char> line;
struct tui_line_or_address line_or_addr; struct tui_line_or_address line_or_addr;
bool is_exec_point = false; bool is_exec_point = false;
tui_bp_flags break_mode = 0; tui_bp_flags break_mode = 0;