ae9bb220ca
breakpoint.c uses gdbarch_breakpoint_from_pc to determine whether a
breakpoint location points at a permanent breakpoint:
static int
bp_loc_is_permanent (struct bp_location *loc)
{
...
addr = loc->address;
bpoint = gdbarch_breakpoint_from_pc (loc->gdbarch, &addr, &len);
...
if (target_read_memory (loc->address, target_mem, len) == 0
&& memcmp (target_mem, bpoint, len) == 0)
retval = 1;
...
So I think we should default the gdbarch_skip_permanent_breakpoint
hook to advancing the PC by the length of the breakpoint instruction,
as determined by gdbarch_breakpoint_from_pc. I believe that simple
implementation does the right thing for most architectures. If
there's an oddball architecture where that doesn't work, then it
should override the hook, just like it should be overriding the hook
if there was no default anyway.
The only two implementation of skip_permanent_breakpoint are
i386_skip_permanent_breakpoint, for x86, and
hppa_skip_permanent_breakpoint, for PA-RISC/HP-UX
The x86 implementation is trivial, and can clearly be replaced by the
new default.
I don't know about the HP-UX one though, I know almost nothing about
PA. It may well be advancing the PC ends up being equivalent.
Otherwise, it must be that "jump $pc_after_bp" doesn't work either...
Tested on x86_64 Fedora 20 native and gdbserver.
gdb/
2014-11-12 Pedro Alves <palves@redhat.com>
* arch-utils.c (default_skip_permanent_breakpoint): New function.
* arch-utils.h (default_skip_permanent_breakpoint): New
declaration.
* gdbarch.sh (skip_permanent_breakpoint): Now an 'f' function.
Install default_skip_permanent_breakpoint as default method.
* i386-tdep.c (i386_skip_permanent_breakpoint): Delete function.
(i386_gdbarch_init): Don't install it.
* infrun.c (resume): Assume there's always a
gdbarch_skip_permanent_breakpoint implementation.
* gdbarch.h, gdbarch.c: Regenerate.
189 lines
7.1 KiB
C
189 lines
7.1 KiB
C
/* Dynamic architecture support for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1998-2014 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 GDBARCH_UTILS_H
|
|
#define GDBARCH_UTILS_H
|
|
|
|
struct gdbarch;
|
|
struct frame_info;
|
|
struct minimal_symbol;
|
|
struct type;
|
|
struct gdbarch_info;
|
|
|
|
/* An implementation of gdbarch_displaced_step_copy_insn for
|
|
processors that don't need to modify the instruction before
|
|
single-stepping the displaced copy.
|
|
|
|
Simply copy gdbarch_max_insn_length (ARCH) bytes from FROM to TO.
|
|
The closure is an array of that many bytes containing the
|
|
instruction's bytes, allocated with xmalloc. */
|
|
extern struct displaced_step_closure *
|
|
simple_displaced_step_copy_insn (struct gdbarch *gdbarch,
|
|
CORE_ADDR from, CORE_ADDR to,
|
|
struct regcache *regs);
|
|
|
|
/* Simple implementation of gdbarch_displaced_step_free_closure: Call
|
|
xfree.
|
|
This is appropriate for use with simple_displaced_step_copy_insn. */
|
|
extern void
|
|
simple_displaced_step_free_closure (struct gdbarch *gdbarch,
|
|
struct displaced_step_closure *closure);
|
|
|
|
/* Default implementation of gdbarch_displaced_hw_singlestep. */
|
|
extern int
|
|
default_displaced_step_hw_singlestep (struct gdbarch *,
|
|
struct displaced_step_closure *);
|
|
|
|
/* Possible value for gdbarch_displaced_step_location:
|
|
Place displaced instructions at the program's entry point,
|
|
leaving space for inferior function call return breakpoints. */
|
|
extern CORE_ADDR displaced_step_at_entry_point (struct gdbarch *gdbarch);
|
|
|
|
/* The only possible cases for inner_than. */
|
|
extern int core_addr_lessthan (CORE_ADDR lhs, CORE_ADDR rhs);
|
|
extern int core_addr_greaterthan (CORE_ADDR lhs, CORE_ADDR rhs);
|
|
|
|
/* Identity functions on a CORE_ADDR. Just return the "addr". */
|
|
|
|
extern CORE_ADDR core_addr_identity (struct gdbarch *gdbarch, CORE_ADDR addr);
|
|
extern gdbarch_convert_from_func_ptr_addr_ftype convert_from_func_ptr_addr_identity;
|
|
|
|
/* No-op conversion of reg to regnum. */
|
|
|
|
extern int no_op_reg_to_regnum (struct gdbarch *gdbarch, int reg);
|
|
|
|
/* Do nothing version of elf_make_msymbol_special. */
|
|
|
|
void default_elf_make_msymbol_special (asymbol *sym,
|
|
struct minimal_symbol *msym);
|
|
|
|
/* Do nothing version of coff_make_msymbol_special. */
|
|
|
|
void default_coff_make_msymbol_special (int val, struct minimal_symbol *msym);
|
|
|
|
/* Version of cannot_fetch_register() / cannot_store_register() that
|
|
always fails. */
|
|
|
|
int cannot_register_not (struct gdbarch *gdbarch, int regnum);
|
|
|
|
/* Legacy version of target_virtual_frame_pointer(). Assumes that
|
|
there is an gdbarch_deprecated_fp_regnum and that it is the same, cooked or
|
|
raw. */
|
|
|
|
extern gdbarch_virtual_frame_pointer_ftype legacy_virtual_frame_pointer;
|
|
|
|
extern CORE_ADDR generic_skip_trampoline_code (struct frame_info *frame,
|
|
CORE_ADDR pc);
|
|
|
|
extern CORE_ADDR generic_skip_solib_resolver (struct gdbarch *gdbarch,
|
|
CORE_ADDR pc);
|
|
|
|
extern int generic_in_solib_return_trampoline (struct gdbarch *gdbarch,
|
|
CORE_ADDR pc, const char *name);
|
|
|
|
extern int generic_in_function_epilogue_p (struct gdbarch *gdbarch,
|
|
CORE_ADDR pc);
|
|
|
|
/* By default, registers are not convertible. */
|
|
extern int generic_convert_register_p (struct gdbarch *gdbarch, int regnum,
|
|
struct type *type);
|
|
|
|
extern int default_stabs_argument_has_addr (struct gdbarch *gdbarch,
|
|
struct type *type);
|
|
|
|
extern int generic_instruction_nullified (struct gdbarch *gdbarch,
|
|
struct regcache *regcache);
|
|
|
|
int default_remote_register_number (struct gdbarch *gdbarch,
|
|
int regno);
|
|
|
|
/* For compatibility with older architectures, returns
|
|
(LEGACY_SIM_REGNO_IGNORE) when the register doesn't have a valid
|
|
name. */
|
|
|
|
extern int legacy_register_sim_regno (struct gdbarch *gdbarch, int regnum);
|
|
|
|
/* Return the selected byte order, or BFD_ENDIAN_UNKNOWN if no byte
|
|
order was explicitly selected. */
|
|
extern enum bfd_endian selected_byte_order (void);
|
|
|
|
/* Return the selected architecture's name, or NULL if no architecture
|
|
was explicitly selected. */
|
|
extern const char *selected_architecture_name (void);
|
|
|
|
/* Initialize a ``struct info''. Can't use memset(0) since some
|
|
default values are not zero. "fill" takes all available
|
|
information and fills in any unspecified fields. */
|
|
|
|
extern void gdbarch_info_init (struct gdbarch_info *info);
|
|
|
|
/* Similar to init, but this time fill in the blanks. Information is
|
|
obtained from the global "set ..." options and explicitly
|
|
initialized INFO fields. */
|
|
extern void gdbarch_info_fill (struct gdbarch_info *info);
|
|
|
|
/* Return the architecture for ABFD. If no suitable architecture
|
|
could be find, return NULL. */
|
|
|
|
extern struct gdbarch *gdbarch_from_bfd (bfd *abfd);
|
|
|
|
/* Return "current" architecture. If the target is running, this is the
|
|
architecture of the selected frame. Otherwise, the "current" architecture
|
|
defaults to the target architecture.
|
|
|
|
This function should normally be called solely by the command interpreter
|
|
routines to determine the architecture to execute a command in. */
|
|
extern struct gdbarch *get_current_arch (void);
|
|
|
|
extern int default_has_shared_address_space (struct gdbarch *);
|
|
|
|
extern int default_fast_tracepoint_valid_at (struct gdbarch *gdbarch,
|
|
CORE_ADDR addr,
|
|
int *isize, char **msg);
|
|
|
|
extern void default_remote_breakpoint_from_pc (struct gdbarch *,
|
|
CORE_ADDR *pcptr, int *kindptr);
|
|
|
|
extern void default_gen_return_address (struct gdbarch *gdbarch,
|
|
struct agent_expr *ax,
|
|
struct axs_value *value,
|
|
CORE_ADDR scope);
|
|
|
|
extern const char *default_auto_charset (void);
|
|
extern const char *default_auto_wide_charset (void);
|
|
|
|
extern int default_return_in_first_hidden_param_p (struct gdbarch *,
|
|
struct type *);
|
|
|
|
extern int default_insn_is_call (struct gdbarch *, CORE_ADDR);
|
|
extern int default_insn_is_ret (struct gdbarch *, CORE_ADDR);
|
|
extern int default_insn_is_jump (struct gdbarch *, CORE_ADDR);
|
|
|
|
/* Do-nothing version of vsyscall_range. Returns false. */
|
|
|
|
extern int default_vsyscall_range (struct gdbarch *gdbarch, struct mem_range *range);
|
|
|
|
/* Default way to advance the PC to the next instruction in order to
|
|
skip a permanent breakpoint. Increments the PC by the size of a
|
|
software breakpoint instruction, as determined with
|
|
gdbarch_breakpoint_from_pc. This matches how the breakpoints
|
|
module determines whether a breakpoint is permanent. */
|
|
extern void default_skip_permanent_breakpoint (struct regcache *regcache);
|
|
|
|
#endif
|