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

gdb/

Browse Source 
* tui/tui-data.c (init_win_info, tui_del_window, tui_free_window):
	Rename field reference filename to fullname.
	* tui/tui-data.h (struct tui_source_info): Rename field filename to
	fullname.  New comment for it.
	* tui/tui-source.c (tui_set_source_content): Rename field reference
	filename to fullname.  Initialize field by symtab_to_fullname now.
	* tui/tui-winsource.c (tui_update_breakpoint_info): Rename field
	reference filename to fullname.  Use symtab_to_fullname during
	comparison.
This commit is contained in:
Jan Kratochvil
2013-02-03 16:05:09 +00:00
parent 652a899601
commit aa079c9346
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/ChangeLog
View File

@ -1,3 +1,15 @@
2013-02-03 Jan Kratochvil <jan.kratochvil@redhat.com>
* tui/tui-data.c (init_win_info, tui_del_window, tui_free_window):
Rename field reference filename to fullname.
* tui/tui-data.h (struct tui_source_info): Rename field filename to
fullname. New comment for it.
* tui/tui-source.c (tui_set_source_content): Rename field reference
filename to fullname. Initialize field by symtab_to_fullname now.
* tui/tui-winsource.c (tui_update_breakpoint_info): Rename field
reference filename to fullname. Use symtab_to_fullname during
comparison.
2013-02-03 Jan Kratochvil <jan.kratochvil@redhat.com> 2013-02-03 Jan Kratochvil <jan.kratochvil@redhat.com>
Code cleanup. Code cleanup.

14
gdb/tui/tui-data.c
View File

@ -541,7 +541,7 @@ init_win_info (struct tui_win_info *win_info)
win_info->detail.source_info.gdbarch = NULL; win_info->detail.source_info.gdbarch = NULL;
win_info->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS; win_info->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS;
win_info->detail.source_info.start_line_or_addr.u.addr = 0; win_info->detail.source_info.start_line_or_addr.u.addr = 0;
win_info->detail.source_info.filename = 0; win_info->detail.source_info.fullname = NULL;
break; break;
case DATA_WIN: case DATA_WIN:
win_info->detail.data_display_info.data_content = (tui_win_content) NULL; win_info->detail.data_display_info.data_content = (tui_win_content) NULL;
@ -681,10 +681,10 @@ tui_del_window (struct tui_win_info *win_info)
generic_win->handle = (WINDOW *) NULL; generic_win->handle = (WINDOW *) NULL;
generic_win->is_visible = FALSE; generic_win->is_visible = FALSE;
} }
if (win_info->detail.source_info.filename) if (win_info->detail.source_info.fullname)
{ {
xfree (win_info->detail.source_info.filename); xfree (win_info->detail.source_info.fullname);
win_info->detail.source_info.filename = 0; win_info->detail.source_info.fullname = NULL;
} }
generic_win = win_info->detail.source_info.execution_info; generic_win = win_info->detail.source_info.execution_info;
if (generic_win != (struct tui_gen_win_info *) NULL) if (generic_win != (struct tui_gen_win_info *) NULL)
@ -731,10 +731,10 @@ tui_free_window (struct tui_win_info *win_info)
generic_win->handle = (WINDOW *) NULL; generic_win->handle = (WINDOW *) NULL;
} }
tui_free_win_content (generic_win); tui_free_win_content (generic_win);
if (win_info->detail.source_info.filename) if (win_info->detail.source_info.fullname)
{ {
xfree (win_info->detail.source_info.filename); xfree (win_info->detail.source_info.fullname);
win_info->detail.source_info.filename = 0; win_info->detail.source_info.fullname = NULL;
} }
generic_win = win_info->detail.source_info.execution_info; generic_win = win_info->detail.source_info.execution_info;
if (generic_win != (struct tui_gen_win_info *) NULL) if (generic_win != (struct tui_gen_win_info *) NULL)

5
gdb/tui/tui-data.h
View File

@ -270,7 +270,10 @@ struct tui_source_info
struct tui_gen_win_info *execution_info; struct tui_gen_win_info *execution_info;
int horizontal_offset; /* Used for horizontal scroll. */ int horizontal_offset; /* Used for horizontal scroll. */
struct tui_line_or_address start_line_or_addr; struct tui_line_or_address start_line_or_addr;
char *filename;
/* It is the resolved form as returned by symtab_to_fullname. */
char *fullname;
/* Architecture associated with code at this location. */ /* Architecture associated with code at this location. */
struct gdbarch *gdbarch; struct gdbarch *gdbarch;
}; };

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

@ -99,9 +99,8 @@ tui_set_source_content (struct symtab *s,
xfree (TUI_SRC_WIN->generic.title); xfree (TUI_SRC_WIN->generic.title);
TUI_SRC_WIN->generic.title = xstrdup (s->filename); TUI_SRC_WIN->generic.title = xstrdup (s->filename);
if (src->filename) xfree (src->fullname);
xfree (src->filename); src->fullname = xstrdup (symtab_to_fullname (s));
src->filename = xstrdup (s->filename);
/* Determine the threshold for the length of the /* Determine the threshold for the length of the
line and the offset to start the display. */ line and the offset to start the display. */

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

@ -463,7 +463,8 @@ tui_update_breakpoint_info (struct tui_win_info *win,
{ {
if ((win == TUI_SRC_WIN if ((win == TUI_SRC_WIN
&& loc->symtab != NULL && loc->symtab != NULL
&& (filename_cmp (src->filename, loc->symtab->filename) == 0) && filename_cmp (src->fullname,
symtab_to_fullname (loc->symtab)) == 0
&& line->line_or_addr.loa == LOA_LINE && line->line_or_addr.loa == LOA_LINE
&& loc->line_number == line->line_or_addr.u.line_no) && loc->line_number == line->line_or_addr.u.line_no)
|| (win == TUI_DISASM_WIN || (win == TUI_DISASM_WIN