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

Use bool for is_exec_point

Browse Source 
This changes tui_source_element::is_exec_point to be a bool.  I looked
at also changing "has_break", but it turns out that this field is used
inconsistently (sometimes as flags and sometimes as a bool), and so
needs more invesstigation before it can be changed.

gdb/ChangeLog
2019-06-25  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.c (tui_clear_source_content)
	(tui_source_window_base::set_is_exec_point_at): Update.
	* tui/tui-source.c (tui_set_source_content_nil): Update.
	* tui/tui-data.h (struct tui_source_element) <is_exec_point>: Now
	a bool.
	* tui/tui-data.c (init_content_element): Update.
This commit is contained in:
Tom Tromey
2019-06-23 10:25:03 -06:00
parent 6658b1bf6c
commit 02c28df011
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_clear_source_content)
(tui_source_window_base::set_is_exec_point_at): Update.
* tui/tui-source.c (tui_set_source_content_nil): Update.
* tui/tui-data.h (struct tui_source_element) <is_exec_point>: Now
a bool.
* tui/tui-data.c (init_content_element): Update.
2019-06-25 Tom Tromey <tom@tromey.com> 2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-wingeneral.c (tui_gen_win_info::make_visible): Update. * tui/tui-wingeneral.c (tui_gen_win_info::make_visible): Update.

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

@ -368,7 +368,7 @@ init_content_element (struct tui_win_element *element,
element->which_element.source.line = NULL; element->which_element.source.line = NULL;
element->which_element.source.line_or_addr.loa = LOA_LINE; element->which_element.source.line_or_addr.loa = LOA_LINE;
element->which_element.source.line_or_addr.u.line_no = 0; element->which_element.source.line_or_addr.u.line_no = 0;
element->which_element.source.is_exec_point = FALSE; element->which_element.source.is_exec_point = false;
element->which_element.source.has_break = FALSE; element->which_element.source.has_break = FALSE;
break; break;
default: default:

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

@ -174,7 +174,7 @@ struct tui_source_element
{ {
char *line; char *line;
struct tui_line_or_address line_or_addr; struct tui_line_or_address line_or_addr;
int is_exec_point; bool is_exec_point;
int has_break; int has_break;
}; };

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

@ -244,7 +244,7 @@ tui_set_source_content_nil (struct tui_win_info *win_info,
element->which_element.source.line_or_addr.loa = LOA_LINE; element->which_element.source.line_or_addr.loa = LOA_LINE;
element->which_element.source.line_or_addr.u.line_no = 0; element->which_element.source.line_or_addr.u.line_no = 0;
element->which_element.source.is_exec_point = FALSE; element->which_element.source.is_exec_point = false;
element->which_element.source.has_break = FALSE; element->which_element.source.has_break = FALSE;
/* Set the contents of the line to blank. */ /* Set the contents of the line to blank. */

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

@ -218,7 +218,7 @@ tui_clear_source_content (struct tui_win_info *win_info,
struct tui_win_element *element = win_info->content[i]; struct tui_win_element *element = win_info->content[i];
element->which_element.source.has_break = FALSE; element->which_element.source.has_break = FALSE;
element->which_element.source.is_exec_point = FALSE; element->which_element.source.is_exec_point = false;
} }
} }
} }
@ -351,13 +351,13 @@ tui_source_window_base::do_scroll_horizontal (int num_to_scroll)
void void
tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l)
{ {
int changed = 0; bool changed = false;
int i; int i;
i = 0; i = 0;
while (i < content_size) while (i < content_size)
{ {
int new_state; bool new_state;
struct tui_line_or_address content_loa = struct tui_line_or_address content_loa =
content[i]->which_element.source.line_or_addr; content[i]->which_element.source.line_or_addr;
@ -367,12 +367,12 @@ tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l)
if (content_loa.loa == l.loa if (content_loa.loa == l.loa
&& ((l.loa == LOA_LINE && content_loa.u.line_no == l.u.line_no) && ((l.loa == LOA_LINE && content_loa.u.line_no == l.u.line_no)
|| (content_loa.u.addr == l.u.addr))) || (content_loa.u.addr == l.u.addr)))
new_state = TRUE; new_state = true;
else else
new_state = FALSE; new_state = false;
if (new_state != content[i]->which_element.source.is_exec_point) if (new_state != content[i]->which_element.source.is_exec_point)
{ {
changed++; changed = true;
content[i]->which_element.source.is_exec_point = new_state; content[i]->which_element.source.is_exec_point = new_state;
tui_show_source_line (this, i + 1); tui_show_source_line (this, i + 1);
} }