MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove target_has_memory macro

Browse Source 
This removes the target_has_memory object-like macro, replacing it
with the underlying function.

gdb/ChangeLog
2020-09-28  Tom Tromey  <tom@tromey.com>

	* target.c (target_has_memory): Rename from target_has_memory_1.
	* tui/tui-regs.c (tui_data_window::show_registers): Update.
	* thread.c (scoped_restore_current_thread::restore)
	(scoped_restore_current_thread::scoped_restore_current_thread):
	Update.
	* frame.c (get_current_frame, has_stack_frames): Update.
	* target.h (target_has_memory): Remove macro.
	(target_has_memory): Rename from target_has_memory_1.
This commit is contained in:
Tom Tromey 2020-09-28 19:38:25 -06:00
parent 5b8a477608
commit a739972c7c
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2020-09-28 Tom Tromey <tom@tromey.com>
* target.c (target_has_memory): Rename from target_has_memory_1.
* tui/tui-regs.c (tui_data_window::show_registers): Update.
* thread.c (scoped_restore_current_thread::restore)
(scoped_restore_current_thread::scoped_restore_current_thread):
Update.
* frame.c (get_current_frame, has_stack_frames): Update.
* target.h (target_has_memory): Remove macro.
(target_has_memory): Rename from target_has_memory_1.
2020-09-28 Tom Tromey <tom@tromey.com> 2020-09-28 Tom Tromey <tom@tromey.com>
* target.c (target_has_all_memory_1): Remove. * target.c (target_has_all_memory_1): Remove.

4
gdb/frame.c
View File

@ -1657,7 +1657,7 @@ get_current_frame (void)
error (_("No registers.")); error (_("No registers."));
if (!target_has_stack) if (!target_has_stack)
error (_("No stack.")); error (_("No stack."));
if (!target_has_memory) if (!target_has_memory ())
error (_("No memory.")); error (_("No memory."));
/* Traceframes are effectively a substitute for the live inferior. */ /* Traceframes are effectively a substitute for the live inferior. */
if (get_traceframe_number () < 0) if (get_traceframe_number () < 0)
@ -1692,7 +1692,7 @@ static struct frame_info *selected_frame;
bool bool
has_stack_frames () has_stack_frames ()
{ {
if (!target_has_registers || !target_has_stack || !target_has_memory) if (!target_has_registers || !target_has_stack || !target_has_memory ())
return false; return false;
/* Traceframes are effectively a substitute for the live inferior. */ /* Traceframes are effectively a substitute for the live inferior. */

2
gdb/target.c
View File

@ -170,7 +170,7 @@ show_targetdebug (struct ui_file *file, int from_tty,
} }
int int
target_has_memory_1 (void) target_has_memory ()
{ {
for (target_ops *t = current_top_target (); t != NULL; t = t->beneath ()) for (target_ops *t = current_top_target (); t != NULL; t = t->beneath ())
if (t->has_memory ()) if (t->has_memory ())

3
gdb/target.h
View File

@ -1812,8 +1812,7 @@ extern void default_target_pass_ctrlc (struct target_ops *ops);
/* Does the target include memory? (Dummy targets don't.) */ /* Does the target include memory? (Dummy targets don't.) */
extern int target_has_memory_1 (void); extern int target_has_memory ();
#define target_has_memory target_has_memory_1 ()
/* Does the target have a stack? (Exec files don't, VxWorks doesn't, until /* Does the target have a stack? (Exec files don't, VxWorks doesn't, until
we start a process.) */ we start a process.) */

4
gdb/thread.c
View File

@ -1407,7 +1407,7 @@ scoped_restore_current_thread::restore ()
&& m_thread->state == THREAD_STOPPED && m_thread->state == THREAD_STOPPED
&& target_has_registers && target_has_registers
&& target_has_stack && target_has_stack
&& target_has_memory) && target_has_memory ())
restore_selected_frame (m_selected_frame_id, m_selected_frame_level); restore_selected_frame (m_selected_frame_id, m_selected_frame_level);
} }
@ -1441,7 +1441,7 @@ scoped_restore_current_thread::scoped_restore_current_thread ()
if (m_was_stopped if (m_was_stopped
&& target_has_registers && target_has_registers
&& target_has_stack && target_has_stack
&& target_has_memory) && target_has_memory ())
{ {
/* When processing internal events, there might not be a /* When processing internal events, there might not be a
selected frame. If we naively call get_selected_frame selected frame. If we naively call get_selected_frame

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

@ -182,7 +182,7 @@ tui_data_window::show_registers (struct reggroup *group)
if (group == 0) if (group == 0)
group = general_reggroup; group = general_reggroup;
if (target_has_registers && target_has_stack && target_has_memory) if (target_has_registers && target_has_stack && target_has_memory ())
{ {
show_register_group (group, get_selected_frame (NULL), show_register_group (group, get_selected_frame (NULL),
group == m_current_group); group == m_current_group);