Remove target_has_stack macro

This removes the target_has_stack object-like macro, replacing it with
the underlying function.

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

	* windows-tdep.c (tlb_make_value): Update.
	* 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)
	(thread_command): Update.
	* stack.c (backtrace_command_1, frame_apply_level_command)
	(frame_apply_all_command, frame_apply_command): Update.
	* infrun.c (siginfo_make_value, restore_infcall_control_state):
	Update.
	* gcore.c (derive_stack_segment): Update.
	* frame.c (get_current_frame, has_stack_frames): Update.
	* auxv.c (info_auxv_command): Update.
	* ada-tasks.c (ada_build_task_list): Update.
	* target.c (target_has_stack): Rename from target_has_stack_1.
	* target.h (target_has_stack): Remove macro.
	(target_has_stack): Rename from target_has_stack_1.
This commit is contained in:
Tom Tromey
2020-09-28 19:38:25 -06:00
parent a739972c7c
commit 841de12014
12 changed files with 37 additions and 19 deletions

View File

@ -1,3 +1,22 @@
2020-09-28 Tom Tromey <tom@tromey.com>
* windows-tdep.c (tlb_make_value): Update.
* 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)
(thread_command): Update.
* stack.c (backtrace_command_1, frame_apply_level_command)
(frame_apply_all_command, frame_apply_command): Update.
* infrun.c (siginfo_make_value, restore_infcall_control_state):
Update.
* gcore.c (derive_stack_segment): Update.
* frame.c (get_current_frame, has_stack_frames): Update.
* auxv.c (info_auxv_command): Update.
* ada-tasks.c (ada_build_task_list): Update.
* target.c (target_has_stack): Rename from target_has_stack_1.
* target.h (target_has_stack): Remove macro.
(target_has_stack): Rename from target_has_stack_1.
2020-09-28 Tom Tromey <tom@tromey.com>
* target.c (target_has_memory): Rename from target_has_memory_1.

View File

@ -999,7 +999,7 @@ ada_build_task_list ()
{
struct ada_tasks_inferior_data *data;
if (!target_has_stack)
if (!target_has_stack ())
error (_("Cannot inspect Ada tasks when program is not running"));
data = get_ada_tasks_inferior_data (current_inferior ());

View File

@ -576,7 +576,7 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
static void
info_auxv_command (const char *cmd, int from_tty)
{
if (! target_has_stack)
if (! target_has_stack ())
error (_("The program has no auxiliary information now."));
else
{

View File

@ -1655,7 +1655,7 @@ get_current_frame (void)
registers". */
if (!target_has_registers)
error (_("No registers."));
if (!target_has_stack)
if (!target_has_stack ())
error (_("No stack."));
if (!target_has_memory ())
error (_("No memory."));
@ -1692,7 +1692,7 @@ static struct frame_info *selected_frame;
bool
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;
/* Traceframes are effectively a substitute for the live inferior. */

View File

@ -224,7 +224,7 @@ derive_stack_segment (bfd_vma *bottom, bfd_vma *top)
gdb_assert (top);
/* Can't succeed without stack and registers. */
if (!target_has_stack || !target_has_registers)
if (!target_has_stack () || !target_has_registers)
return 0;
/* Can't succeed without current frame. */

View File

@ -8843,7 +8843,7 @@ static struct value *
siginfo_make_value (struct gdbarch *gdbarch, struct internalvar *var,
void *ignore)
{
if (target_has_stack
if (target_has_stack ()
&& inferior_ptid != null_ptid
&& gdbarch_get_siginfo_type_p (gdbarch))
{
@ -9078,7 +9078,7 @@ restore_infcall_control_state (struct infcall_control_state *inf_status)
stop_stack_dummy = inf_status->stop_stack_dummy;
stopped_by_random_signal = inf_status->stopped_by_random_signal;
if (target_has_stack)
if (target_has_stack ())
{
/* The point of the try/catch is that if the stack is clobbered,
walking the stack might encounter a garbage pointer and

View File

@ -2001,7 +2001,7 @@ backtrace_command_1 (const frame_print_options &fp_opts,
int py_start = 0, py_end = 0;
enum ext_lang_bt_status result = EXT_LANG_BT_ERROR;
if (!target_has_stack)
if (!target_has_stack ())
error (_("No stack."));
if (count_exp)
@ -3164,7 +3164,7 @@ frame_apply_cmd_completer (struct cmd_list_element *ignore,
static void
frame_apply_level_command (const char *cmd, int from_tty)
{
if (!target_has_stack)
if (!target_has_stack ())
error (_("No stack."));
bool level_found = false;
@ -3212,7 +3212,7 @@ frame_apply_level_command (const char *cmd, int from_tty)
static void
frame_apply_all_command (const char *cmd, int from_tty)
{
if (!target_has_stack)
if (!target_has_stack ())
error (_("No stack."));
frame_apply_command_count ("frame apply all", cmd, from_tty,
@ -3227,7 +3227,7 @@ frame_apply_command (const char* cmd, int from_tty)
int count;
struct frame_info *trailing;
if (!target_has_stack)
if (!target_has_stack ())
error (_("No stack."));
if (cmd == NULL)

View File

@ -180,7 +180,7 @@ target_has_memory ()
}
int
target_has_stack_1 (void)
target_has_stack ()
{
for (target_ops *t = current_top_target (); t != NULL; t = t->beneath ())
if (t->has_stack ())

View File

@ -1817,8 +1817,7 @@ extern int target_has_memory ();
/* Does the target have a stack? (Exec files don't, VxWorks doesn't, until
we start a process.) */
extern int target_has_stack_1 (void);
#define target_has_stack target_has_stack_1 ()
extern int target_has_stack ();
/* Does the target have registers? (Exec files don't.) */

View File

@ -1406,7 +1406,7 @@ scoped_restore_current_thread::restore ()
&& m_was_stopped
&& m_thread->state == THREAD_STOPPED
&& target_has_registers
&& target_has_stack
&& target_has_stack ()
&& target_has_memory ())
restore_selected_frame (m_selected_frame_id, m_selected_frame_level);
}
@ -1440,7 +1440,7 @@ scoped_restore_current_thread::scoped_restore_current_thread ()
m_was_stopped = m_thread->state == THREAD_STOPPED;
if (m_was_stopped
&& target_has_registers
&& target_has_stack
&& target_has_stack ()
&& target_has_memory ())
{
/* When processing internal events, there might not be a
@ -1876,7 +1876,7 @@ thread_command (const char *tidstr, int from_tty)
if (inferior_ptid == null_ptid)
error (_("No thread selected"));
if (target_has_stack)
if (target_has_stack ())
{
struct thread_info *tp = inferior_thread ();

View File

@ -182,7 +182,7 @@ tui_data_window::show_registers (struct reggroup *group)
if (group == 0)
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),
group == m_current_group);

View File

@ -435,7 +435,7 @@ static const struct lval_funcs tlb_value_funcs =
static struct value *
tlb_make_value (struct gdbarch *gdbarch, struct internalvar *var, void *ignore)
{
if (target_has_stack && inferior_ptid != null_ptid)
if (target_has_stack () && inferior_ptid != null_ptid)
{
struct type *type = windows_get_tlb_type (gdbarch);
return allocate_computed_value (type, &tlb_value_funcs, NULL);