/* Simulate breakpoints by patching locations in the target system, for GDB.
- Copyright (C) 1990-2014 Free Software Foundation, Inc.
+ Copyright (C) 1990-2017 Free Software Foundation, Inc.
Contributed by Cygnus Support. Written by John Gilmore.
int val;
/* Determine appropriate breakpoint contents and size for this address. */
- bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
- if (bp == NULL)
- error (_("Software breakpoints not implemented for this target."));
-
- bp_tgt->placed_address = addr;
- bp_tgt->placed_size = bplen;
+ 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. */
- bp_tgt->shadow_len = bplen;
- readbuf = alloca (bplen);
+ 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);
}
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,
- bp_tgt->placed_size);
+ bplen);
}
int
memory_remove_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
- struct bp_target_info *bp_tgt)
+ struct bp_target_info *bp_tgt,
+ enum remove_bp_reason reason)
{
return gdbarch_memory_remove_breakpoint (gdbarch, bp_tgt);
}
address. */
bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
- if (bp == NULL || bp_tgt->placed_size != bplen)
+ if (bp == NULL)
return 0;
/* Make sure we see the memory breakpoints. */