mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
4c7d57e72e
If you run "gdb -i=mi2" and set a "display", then when "next"ing the displays will be shown twice: ~"1: x = 23\n" ~"7\t printf(\"%d\\n\", x);\n" ~"1: x = 23\n" *stopped,reason="end-stepping-range",frame={addr="0x0000000000400565",func="main",args=[],file="q.c",fullname="/tmp/q.c",line="7"},thread-id="1",stopped-threads="all",core="1" The immediate cause of this is this code in mi_on_normal_stop_1: print_stop_event (mi_uiout); console_interp = interp_lookup (current_ui, INTERP_CONSOLE); if (should_print_stop_to_console (console_interp, tp)) print_stop_event (mi->cli_uiout); ... which obviously prints the stop twice. However, I think the first call to print_stop_event is intended just to emit the MI *stopped notification, which explains why the source line does not show up two times. This patch fixes the bug by changing print_stop_event to only call do_displays for non-MI-like ui-outs. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-03-19 Tom Tromey <tromey@adacore.com> * mi/mi-interp.c (mi_on_normal_stop_1): Only show displays once. * infrun.h (print_stop_event): Add "displays" parameter. * infrun.c (print_stop_event): Add "displays" parameter. gdb/testsuite/ChangeLog 2019-03-19 Tom Tromey <tromey@adacore.com> * gdb.mi/mi2-cli-display.c: New file. * gdb.mi/mi2-cli-display.exp: New file.
307 lines
10 KiB
C++
307 lines
10 KiB
C++
/* Copyright (C) 1986-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef INFRUN_H
|
|
#define INFRUN_H 1
|
|
|
|
#include "symtab.h"
|
|
#include "common/byte-vector.h"
|
|
|
|
struct target_waitstatus;
|
|
struct frame_info;
|
|
struct address_space;
|
|
struct return_value_info;
|
|
|
|
/* True if we are debugging run control. */
|
|
extern unsigned int debug_infrun;
|
|
|
|
/* True if we are debugging displaced stepping. */
|
|
extern int debug_displaced;
|
|
|
|
/* Nonzero if we want to give control to the user when we're notified
|
|
of shared library events by the dynamic linker. */
|
|
extern int stop_on_solib_events;
|
|
|
|
/* True if execution commands resume all threads of all processes by
|
|
default; otherwise, resume only threads of the current inferior
|
|
process. */
|
|
extern int sched_multi;
|
|
|
|
/* When set, stop the 'step' command if we enter a function which has
|
|
no line number information. The normal behavior is that we step
|
|
over such function. */
|
|
extern int step_stop_if_no_debug;
|
|
|
|
/* If set, the inferior should be controlled in non-stop mode. In
|
|
this mode, each thread is controlled independently. Execution
|
|
commands apply only to the selected thread by default, and stop
|
|
events stop only the thread that had the event -- the other threads
|
|
are kept running freely. */
|
|
extern int non_stop;
|
|
|
|
/* When set (default), the target should attempt to disable the
|
|
operating system's address space randomization feature when
|
|
starting an inferior. */
|
|
extern int disable_randomization;
|
|
|
|
/* Returns a unique identifier for the current stop. This can be used
|
|
to tell whether a command has proceeded the inferior past the
|
|
current location. */
|
|
extern ULONGEST get_stop_id (void);
|
|
|
|
/* Reverse execution. */
|
|
enum exec_direction_kind
|
|
{
|
|
EXEC_FORWARD,
|
|
EXEC_REVERSE
|
|
};
|
|
|
|
/* The current execution direction. */
|
|
extern enum exec_direction_kind execution_direction;
|
|
|
|
extern void start_remote (int from_tty);
|
|
|
|
/* Clear out all variables saying what to do when inferior is
|
|
continued or stepped. First do this, then set the ones you want,
|
|
then call `proceed'. STEP indicates whether we're preparing for a
|
|
step/stepi command. */
|
|
extern void clear_proceed_status (int step);
|
|
|
|
extern void proceed (CORE_ADDR, enum gdb_signal);
|
|
|
|
/* Return a ptid representing the set of threads that we will proceed,
|
|
in the perspective of the user/frontend. We may actually resume
|
|
fewer threads at first, e.g., if a thread is stopped at a
|
|
breakpoint that needs stepping-off, but that should not be visible
|
|
to the user/frontend, and neither should the frontend/user be
|
|
allowed to proceed any of the threads that happen to be stopped for
|
|
internal run control handling, if a previous command wanted them
|
|
resumed. */
|
|
extern ptid_t user_visible_resume_ptid (int step);
|
|
|
|
extern void wait_for_inferior (void);
|
|
|
|
/* Return control to GDB when the inferior stops for real. Print
|
|
appropriate messages, remove breakpoints, give terminal our modes,
|
|
and run the stop hook. Returns true if the stop hook proceeded the
|
|
target, false otherwise. */
|
|
extern int normal_stop (void);
|
|
|
|
extern void get_last_target_status (ptid_t *ptid,
|
|
struct target_waitstatus *status);
|
|
|
|
extern void set_last_target_status (ptid_t ptid,
|
|
struct target_waitstatus status);
|
|
|
|
/* Stop all threads. Only returns after everything is halted. */
|
|
extern void stop_all_threads (void);
|
|
|
|
extern void prepare_for_detach (void);
|
|
|
|
extern void fetch_inferior_event (void *);
|
|
|
|
extern void init_wait_for_inferior (void);
|
|
|
|
extern void insert_step_resume_breakpoint_at_sal (struct gdbarch *,
|
|
struct symtab_and_line ,
|
|
struct frame_id);
|
|
|
|
/* Returns true if we're trying to step past the instruction at
|
|
ADDRESS in ASPACE. */
|
|
extern int stepping_past_instruction_at (struct address_space *aspace,
|
|
CORE_ADDR address);
|
|
|
|
/* Returns true if thread whose thread number is THREAD is stepping
|
|
over a breakpoint. */
|
|
extern int thread_is_stepping_over_breakpoint (int thread);
|
|
|
|
/* Returns true if we're trying to step past an instruction that
|
|
triggers a non-steppable watchpoint. */
|
|
extern int stepping_past_nonsteppable_watchpoint (void);
|
|
|
|
extern void set_step_info (struct frame_info *frame,
|
|
struct symtab_and_line sal);
|
|
|
|
/* Several print_*_reason helper functions to print why the inferior
|
|
has stopped to the passed in UIOUT. */
|
|
|
|
/* Signal received, print why the inferior has stopped. */
|
|
extern void print_signal_received_reason (struct ui_out *uiout,
|
|
enum gdb_signal siggnal);
|
|
|
|
/* Print why the inferior has stopped. We are done with a
|
|
step/next/si/ni command, print why the inferior has stopped. */
|
|
extern void print_end_stepping_range_reason (struct ui_out *uiout);
|
|
|
|
/* The inferior was terminated by a signal, print why it stopped. */
|
|
extern void print_signal_exited_reason (struct ui_out *uiout,
|
|
enum gdb_signal siggnal);
|
|
|
|
/* The inferior program is finished, print why it stopped. */
|
|
extern void print_exited_reason (struct ui_out *uiout, int exitstatus);
|
|
|
|
/* Reverse execution: target ran out of history info, print why the
|
|
inferior has stopped. */
|
|
extern void print_no_history_reason (struct ui_out *uiout);
|
|
|
|
/* Print the result of a function at the end of a 'finish' command.
|
|
RV points at an object representing the captured return value/type
|
|
and its position in the value history. */
|
|
|
|
extern void print_return_value (struct ui_out *uiout,
|
|
struct return_value_info *rv);
|
|
|
|
/* Print current location without a level number, if we have changed
|
|
functions or hit a breakpoint. Print source line if we have one.
|
|
If the execution command captured a return value, print it. If
|
|
DISPLAYS is false, do not call 'do_displays'. */
|
|
|
|
extern void print_stop_event (struct ui_out *uiout, bool displays = true);
|
|
|
|
/* Pretty print the results of target_wait, for debugging purposes. */
|
|
|
|
extern void print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
|
|
const struct target_waitstatus *ws);
|
|
|
|
extern int signal_stop_state (int);
|
|
|
|
extern int signal_print_state (int);
|
|
|
|
extern int signal_pass_state (int);
|
|
|
|
extern int signal_stop_update (int, int);
|
|
|
|
extern int signal_print_update (int, int);
|
|
|
|
extern int signal_pass_update (int, int);
|
|
|
|
extern void update_signals_program_target (void);
|
|
|
|
/* Clear the convenience variables associated with the exit of the
|
|
inferior. Currently, those variables are $_exitcode and
|
|
$_exitsignal. */
|
|
extern void clear_exit_convenience_vars (void);
|
|
|
|
/* Dump LEN bytes at BUF in hex to FILE, followed by a newline. */
|
|
extern void displaced_step_dump_bytes (struct ui_file *file,
|
|
const gdb_byte *buf, size_t len);
|
|
|
|
extern struct displaced_step_closure *get_displaced_step_closure_by_addr
|
|
(CORE_ADDR addr);
|
|
|
|
extern void update_observer_mode (void);
|
|
|
|
extern void signal_catch_update (const unsigned int *);
|
|
|
|
/* In some circumstances we allow a command to specify a numeric
|
|
signal. The idea is to keep these circumstances limited so that
|
|
users (and scripts) develop portable habits. For comparison,
|
|
POSIX.2 `kill' requires that 1,2,3,6,9,14, and 15 work (and using a
|
|
numeric signal at all is obsolescent. We are slightly more lenient
|
|
and allow 1-15 which should match host signal numbers on most
|
|
systems. Use of symbolic signal names is strongly encouraged. */
|
|
enum gdb_signal gdb_signal_from_command (int num);
|
|
|
|
/* Enables/disables infrun's async event source in the event loop. */
|
|
extern void infrun_async (int enable);
|
|
|
|
/* Call infrun's event handler the next time through the event
|
|
loop. */
|
|
extern void mark_infrun_async_event_handler (void);
|
|
|
|
/* The global queue of threads that need to do a step-over operation
|
|
to get past e.g., a breakpoint. */
|
|
extern struct thread_info *step_over_queue_head;
|
|
|
|
/* Remove breakpoints if possible (usually that means, if everything
|
|
is stopped). On failure, print a message. */
|
|
extern void maybe_remove_breakpoints (void);
|
|
|
|
/* If a UI was in sync execution mode, and now isn't, restore its
|
|
prompt (a synchronous execution command has finished, and we're
|
|
ready for input). */
|
|
extern void all_uis_check_sync_execution_done (void);
|
|
|
|
/* If a UI was in sync execution mode, and hasn't displayed the prompt
|
|
yet, re-disable its prompt (a synchronous execution command was
|
|
started or re-started). */
|
|
extern void all_uis_on_sync_execution_starting (void);
|
|
|
|
/* Base class for displaced stepping closures (the arch-specific data). */
|
|
|
|
struct displaced_step_closure
|
|
{
|
|
virtual ~displaced_step_closure () = 0;
|
|
};
|
|
|
|
/* A simple displaced step closure that contains only a byte buffer. */
|
|
|
|
struct buf_displaced_step_closure : displaced_step_closure
|
|
{
|
|
buf_displaced_step_closure (int buf_size)
|
|
: buf (buf_size)
|
|
{}
|
|
|
|
gdb::byte_vector buf;
|
|
};
|
|
|
|
/* Per-inferior displaced stepping state. */
|
|
struct displaced_step_inferior_state
|
|
{
|
|
displaced_step_inferior_state ()
|
|
{
|
|
reset ();
|
|
}
|
|
|
|
/* Put this object back in its original state. */
|
|
void reset ()
|
|
{
|
|
failed_before = 0;
|
|
step_thread = nullptr;
|
|
step_gdbarch = nullptr;
|
|
step_closure = nullptr;
|
|
step_original = 0;
|
|
step_copy = 0;
|
|
step_saved_copy.clear ();
|
|
}
|
|
|
|
/* True if preparing a displaced step ever failed. If so, we won't
|
|
try displaced stepping for this inferior again. */
|
|
int failed_before;
|
|
|
|
/* If this is not nullptr, this is the thread carrying out a
|
|
displaced single-step in process PID. This thread's state will
|
|
require fixing up once it has completed its step. */
|
|
thread_info *step_thread;
|
|
|
|
/* The architecture the thread had when we stepped it. */
|
|
gdbarch *step_gdbarch;
|
|
|
|
/* The closure provided gdbarch_displaced_step_copy_insn, to be used
|
|
for post-step cleanup. */
|
|
displaced_step_closure *step_closure;
|
|
|
|
/* The address of the original instruction, and the copy we
|
|
made. */
|
|
CORE_ADDR step_original, step_copy;
|
|
|
|
/* Saved contents of copy area. */
|
|
gdb::byte_vector step_saved_copy;
|
|
};
|
|
|
|
#endif /* INFRUN_H */
|