ba7b109b29
Fix a commit cd6c3b4ffc ("New gdbarch methods breakpoint_kind_from_pc
and sw_breakpoint_from_kind") regression and restore the use of
`->placed_address' rather than `->reqstd_address' as the location for a
memory breakpoint to be inserted at. Previously
`gdbarch_breakpoint_from_pc' was used that made that adjustment in
`default_memory_insert_breakpoint' from the preinitialized value,
however with the said commit that call is gone, so the passed
`->placed_address' has to be used for the initialization.
The regression manifests itself as the inability to debug any MIPS/Linux
compressed ISA dynamic executable as GDB corrupts the dynamic loader
with one of its implicit breakpoints, causing the program to crash, as
seen for example with the `mips-linux-gnu' target, o32 ABI, MIPS16 code,
and the gdb.base/advance.exp test case:
(gdb) continue
Continuing.
Program received signal SIGBUS, Bus error.
_dl_debug_initialize (ldbase=0, ns=0) at dl-debug.c:51
51 r = &_r_debug;
(gdb) FAIL: gdb.base/advance.exp: Can't run to main
gdb/
PR breakpoints/21886
* mem-break.c (default_memory_insert_breakpoint): Use
`->placed_address' rather than `->reqstd_address' for the
breakpoint location.
132 lines
4.2 KiB
C
132 lines
4.2 KiB
C
/* Simulate breakpoints by patching locations in the target system, for GDB.
|
|
|
|
Copyright (C) 1990-2017 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Support. Written by John Gilmore.
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "symtab.h"
|
|
#include "breakpoint.h"
|
|
#include "inferior.h"
|
|
#include "target.h"
|
|
/* Insert a breakpoint on targets that don't have any better
|
|
breakpoint support. We read the contents of the target location
|
|
and stash it, then overwrite it with a breakpoint instruction.
|
|
BP_TGT->placed_address is the target location in the target
|
|
machine. BP_TGT->shadow_contents is some memory allocated for
|
|
saving the target contents. It is guaranteed by the caller to be
|
|
long enough to save BREAKPOINT_LEN bytes (this is accomplished via
|
|
BREAKPOINT_MAX). */
|
|
|
|
int
|
|
default_memory_insert_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
CORE_ADDR addr = bp_tgt->placed_address;
|
|
const unsigned char *bp;
|
|
gdb_byte *readbuf;
|
|
int bplen;
|
|
int val;
|
|
|
|
/* Determine appropriate breakpoint contents and size for this address. */
|
|
bp = gdbarch_sw_breakpoint_from_kind (gdbarch, bp_tgt->kind, &bplen);
|
|
|
|
/* Save the memory contents in the shadow_contents buffer and then
|
|
write the breakpoint instruction. */
|
|
readbuf = (gdb_byte *) alloca (bplen);
|
|
val = target_read_memory (addr, readbuf, bplen);
|
|
if (val == 0)
|
|
{
|
|
/* These must be set together, either before or after the shadow
|
|
read, so that if we're "reinserting" a breakpoint that
|
|
doesn't have a shadow yet, the breakpoint masking code inside
|
|
target_read_memory doesn't mask out this breakpoint using an
|
|
unfilled shadow buffer. The core may be trying to reinsert a
|
|
permanent breakpoint, for targets that support breakpoint
|
|
conditions/commands on the target side for some types of
|
|
breakpoints, such as target remote. */
|
|
bp_tgt->shadow_len = bplen;
|
|
memcpy (bp_tgt->shadow_contents, readbuf, bplen);
|
|
|
|
val = target_write_raw_memory (addr, bp, bplen);
|
|
}
|
|
|
|
return val;
|
|
}
|
|
|
|
|
|
int
|
|
default_memory_remove_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
int bplen;
|
|
|
|
gdbarch_sw_breakpoint_from_kind (gdbarch, bp_tgt->kind, &bplen);
|
|
|
|
return target_write_raw_memory (bp_tgt->placed_address, bp_tgt->shadow_contents,
|
|
bplen);
|
|
}
|
|
|
|
|
|
int
|
|
memory_insert_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
return gdbarch_memory_insert_breakpoint (gdbarch, bp_tgt);
|
|
}
|
|
|
|
int
|
|
memory_remove_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt,
|
|
enum remove_bp_reason reason)
|
|
{
|
|
return gdbarch_memory_remove_breakpoint (gdbarch, bp_tgt);
|
|
}
|
|
|
|
int
|
|
memory_validate_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
CORE_ADDR addr = bp_tgt->placed_address;
|
|
const gdb_byte *bp;
|
|
int val;
|
|
int bplen;
|
|
gdb_byte cur_contents[BREAKPOINT_MAX];
|
|
struct cleanup *cleanup;
|
|
int ret;
|
|
|
|
/* Determine appropriate breakpoint contents and size for this
|
|
address. */
|
|
bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
|
|
|
|
if (bp == NULL)
|
|
return 0;
|
|
|
|
/* Make sure we see the memory breakpoints. */
|
|
cleanup = make_show_memory_breakpoints_cleanup (1);
|
|
val = target_read_memory (addr, cur_contents, bplen);
|
|
|
|
/* If our breakpoint is no longer at the address, this means that
|
|
the program modified the code on us, so it is wrong to put back
|
|
the old value. */
|
|
ret = (val == 0 && memcmp (bp, cur_contents, bplen) == 0);
|
|
|
|
do_cleanups (cleanup);
|
|
return ret;
|
|
}
|