mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
480af54cf6
The displaced_step_buffer class, introduced in the previous patch, manages access to a single displaced step buffer. Change it into displaced_step_buffers (note the plural), which manages access to multiple displaced step buffers. When preparing a displaced step for a thread, it looks for an unused buffer. For now, all users still pass a single displaced step buffer, so no real behavior change is expected here. The following patch makes a user pass more than one buffer, so the functionality introduced by this patch is going to be useful in the next one. gdb/ChangeLog: * displaced-stepping.h (struct displaced_step_buffer): Rename to... (struct displaced_step_buffers): ... this. <m_addr, m_current_thread, m_copy_insn_closure>: Remove. <struct displaced_step_buffer>: New inner class. <m_buffers>: New. * displaced-stepping.c (displaced_step_buffer::prepare): Rename to... (displaced_step_buffers::prepare): ... this, adjust for multiple buffers. (displaced_step_buffer::finish): Rename to... (displaced_step_buffers::finish): ... this, adjust for multiple buffers. (displaced_step_buffer::copy_insn_closure_by_addr): Rename to... (displaced_step_buffers::copy_insn_closure_by_addr): ... this, adjust for multiple buffers. (displaced_step_buffer::restore_in_ptid): Rename to... (displaced_step_buffers::restore_in_ptid): ... this, adjust for multiple buffers. * linux-tdep.h (linux_init_abi): Change supports_displaced_step for num_disp_step_buffers. * linux-tdep.c (struct linux_gdbarch_data) <num_disp_step_buffers>: New field. (struct linux_info) <disp_step_buf>: Rename to... <disp_step_bufs>: ... this, change type to displaced_step_buffers. (linux_displaced_step_prepare): Use linux_gdbarch_data::num_disp_step_buffers to create that number of buffers. (linux_displaced_step_finish): Adjust. (linux_displaced_step_copy_insn_closure_by_addr): Adjust. (linux_displaced_step_restore_all_in_ptid): Adjust. (linux_init_abi): Change supports_displaced_step parameter for num_disp_step_buffers, save it in linux_gdbarch_data. * aarch64-linux-tdep.c (aarch64_linux_init_abi): Adjust. * alpha-linux-tdep.c (alpha_linux_init_abi): Adjust. * amd64-linux-tdep.c (amd64_linux_init_abi_common): Change supports_displaced_step parameter for num_disp_step_buffers. (amd64_linux_init_abi): Adjust. (amd64_x32_linux_init_abi): Adjust. * arc-linux-tdep.c (arc_linux_init_osabi): Adjust. * arm-linux-tdep.c (arm_linux_init_abi): Adjust. * bfin-linux-tdep.c (bfin_linux_init_abi): Adjust. * cris-linux-tdep.c (cris_linux_init_abi): Adjust. * csky-linux-tdep.c (csky_linux_init_abi): Adjust. * frv-linux-tdep.c (frv_linux_init_abi): Adjust. * hppa-linux-tdep.c (hppa_linux_init_abi): Adjust. * i386-linux-tdep.c (i386_linux_init_abi): Adjust. * ia64-linux-tdep.c (ia64_linux_init_abi): Adjust. * m32r-linux-tdep.c (m32r_linux_init_abi): Adjust. * m68k-linux-tdep.c (m68k_linux_init_abi): * microblaze-linux-tdep.c (microblaze_linux_init_abi): * mips-linux-tdep.c (mips_linux_init_abi): Adjust. * mn10300-linux-tdep.c (am33_linux_init_osabi): Adjust. * nios2-linux-tdep.c (nios2_linux_init_abi): Adjust. * or1k-linux-tdep.c (or1k_linux_init_abi): Adjust. * ppc-linux-tdep.c (ppc_linux_init_abi): Adjust. * riscv-linux-tdep.c (riscv_linux_init_abi): Adjust. * rs6000-tdep.c (struct ppc_inferior_data) <disp_step_buf>: Change type to displaced_step_buffers. * s390-linux-tdep.c (s390_linux_init_abi_any): Adjust. * sh-linux-tdep.c (sh_linux_init_abi): Adjust. * sparc-linux-tdep.c (sparc32_linux_init_abi): Adjust. * sparc64-linux-tdep.c (sparc64_linux_init_abi): Adjust. * tic6x-linux-tdep.c (tic6x_uclinux_init_abi): Adjust. * tilegx-linux-tdep.c (tilegx_linux_init_abi): Adjust. * xtensa-linux-tdep.c (xtensa_linux_init_abi): Adjust. Change-Id: Ia9c02f207da2c9e1d9188020139619122392bb70
216 lines
5.9 KiB
C++
216 lines
5.9 KiB
C++
/* Displaced stepping related things.
|
|
|
|
Copyright (C) 2020 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 DISPLACED_STEPPING_H
|
|
#define DISPLACED_STEPPING_H
|
|
|
|
#include "gdbsupport/array-view.h"
|
|
#include "gdbsupport/byte-vector.h"
|
|
|
|
struct gdbarch;
|
|
struct thread_info;
|
|
|
|
/* True if we are debugging displaced stepping. */
|
|
|
|
extern bool debug_displaced;
|
|
|
|
/* Print a "displaced" debug statement. */
|
|
|
|
#define displaced_debug_printf(fmt, ...) \
|
|
do \
|
|
{ \
|
|
if (debug_displaced) \
|
|
debug_prefixed_printf ("displaced", __func__, fmt, ##__VA_ARGS__); \
|
|
} \
|
|
while (0)
|
|
|
|
enum displaced_step_prepare_status
|
|
{
|
|
/* A displaced stepping buffer was successfully allocated and prepared. */
|
|
DISPLACED_STEP_PREPARE_STATUS_OK,
|
|
|
|
/* This particular instruction can't be displaced stepped, GDB should fall
|
|
back on in-line stepping. */
|
|
DISPLACED_STEP_PREPARE_STATUS_CANT,
|
|
|
|
/* Not enough resources are available at this time, try again later. */
|
|
DISPLACED_STEP_PREPARE_STATUS_UNAVAILABLE,
|
|
};
|
|
|
|
enum displaced_step_finish_status
|
|
{
|
|
/* Either the instruction was stepped and fixed up, or the specified thread
|
|
wasn't executing a displaced step (in which case there's nothing to
|
|
finish). */
|
|
DISPLACED_STEP_FINISH_STATUS_OK,
|
|
|
|
/* The thread started a displaced step, but didn't complete it. */
|
|
DISPLACED_STEP_FINISH_STATUS_NOT_EXECUTED,
|
|
};
|
|
|
|
/* Data returned by a gdbarch displaced_step_copy_insn method, to be passed to
|
|
the matching displaced_step_fixup method. */
|
|
|
|
struct displaced_step_copy_insn_closure
|
|
{
|
|
virtual ~displaced_step_copy_insn_closure () = 0;
|
|
};
|
|
|
|
using displaced_step_copy_insn_closure_up
|
|
= std::unique_ptr<displaced_step_copy_insn_closure>;
|
|
|
|
/* A simple displaced step closure that contains only a byte buffer. */
|
|
|
|
struct buf_displaced_step_copy_insn_closure : displaced_step_copy_insn_closure
|
|
{
|
|
buf_displaced_step_copy_insn_closure (int buf_size)
|
|
: buf (buf_size)
|
|
{}
|
|
|
|
/* The content of this buffer is up to the user of the class, but typically
|
|
original instruction bytes, used during fixup to determine what needs to
|
|
be fixed up. */
|
|
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 = false;
|
|
in_progress_count = 0;
|
|
unavailable = false;
|
|
}
|
|
|
|
/* True if preparing a displaced step ever failed. If so, we won't
|
|
try displaced stepping for this inferior again. */
|
|
bool failed_before;
|
|
|
|
/* Number of displaced steps in progress for this inferior. */
|
|
unsigned int in_progress_count;
|
|
|
|
/* If true, this tells GDB that it's not worth asking the gdbarch displaced
|
|
stepping implementation to prepare a displaced step, because it would
|
|
return UNAVAILABLE. This is set and reset by the gdbarch in the
|
|
displaced_step_prepare and displaced_step_finish methods. */
|
|
bool unavailable;
|
|
};
|
|
|
|
/* Per-thread displaced stepping state. */
|
|
|
|
struct displaced_step_thread_state
|
|
{
|
|
/* Return true if this thread is currently executing a displaced step. */
|
|
bool in_progress () const
|
|
{
|
|
return m_original_gdbarch != nullptr;
|
|
}
|
|
|
|
/* Return the gdbarch of the thread prior to the step. */
|
|
gdbarch *get_original_gdbarch () const
|
|
{
|
|
return m_original_gdbarch;
|
|
}
|
|
|
|
/* Mark this thread as currently executing a displaced step.
|
|
|
|
ORIGINAL_GDBARCH is the current gdbarch of the thread (before the step
|
|
is executed). */
|
|
void set (gdbarch *original_gdbarch)
|
|
{
|
|
m_original_gdbarch = original_gdbarch;
|
|
}
|
|
|
|
/* Mark this thread as no longer executing a displaced step. */
|
|
void reset ()
|
|
{
|
|
m_original_gdbarch = nullptr;
|
|
}
|
|
|
|
private:
|
|
gdbarch *m_original_gdbarch = nullptr;
|
|
};
|
|
|
|
/* Control access to multiple displaced stepping buffers at fixed addresses. */
|
|
|
|
struct displaced_step_buffers
|
|
{
|
|
explicit displaced_step_buffers (gdb::array_view<CORE_ADDR> buffer_addrs)
|
|
{
|
|
gdb_assert (buffer_addrs.size () > 0);
|
|
|
|
m_buffers.reserve (buffer_addrs.size ());
|
|
|
|
for (CORE_ADDR buffer_addr : buffer_addrs)
|
|
m_buffers.emplace_back (buffer_addr);
|
|
}
|
|
|
|
displaced_step_prepare_status prepare (thread_info *thread,
|
|
CORE_ADDR &displaced_pc);
|
|
|
|
displaced_step_finish_status finish (gdbarch *arch, thread_info *thread,
|
|
gdb_signal sig);
|
|
|
|
const displaced_step_copy_insn_closure *
|
|
copy_insn_closure_by_addr (CORE_ADDR addr);
|
|
|
|
void restore_in_ptid (ptid_t ptid);
|
|
|
|
private:
|
|
|
|
/* State of a single buffer. */
|
|
|
|
struct displaced_step_buffer
|
|
{
|
|
explicit displaced_step_buffer (CORE_ADDR addr)
|
|
: addr (addr)
|
|
{}
|
|
|
|
/* Address of the buffer. */
|
|
const CORE_ADDR addr;
|
|
|
|
/* The original PC of the instruction currently being stepped. */
|
|
CORE_ADDR original_pc = 0;
|
|
|
|
/* If set, the thread currently using the buffer. If unset, the buffer is not
|
|
used. */
|
|
thread_info *current_thread = nullptr;
|
|
|
|
/* Saved copy of the bytes in the displaced buffer, to be restored once the
|
|
buffer is no longer used. */
|
|
gdb::byte_vector saved_copy;
|
|
|
|
/* Closure obtained from gdbarch_displaced_step_copy_insn, to be passed to
|
|
gdbarch_displaced_step_fixup_insn. */
|
|
displaced_step_copy_insn_closure_up copy_insn_closure;
|
|
};
|
|
|
|
std::vector<displaced_step_buffer> m_buffers;
|
|
};
|
|
|
|
#endif /* DISPLACED_STEPPING_H */
|