#include "breakpoint.h"
#include "inferior.h"
#include "target.h"
-#include <string.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.
default_memory_insert_breakpoint (struct gdbarch *gdbarch,
struct bp_target_info *bp_tgt)
{
- int val;
+ CORE_ADDR addr = bp_tgt->reqstd_address;
const unsigned char *bp;
gdb_byte *readbuf;
+ int bplen;
+ int val;
/* Determine appropriate breakpoint contents and size for this address. */
- bp = gdbarch_breakpoint_from_pc
- (gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
+ 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;
+
/* Save the memory contents in the shadow_contents buffer and then
write the breakpoint instruction. */
- bp_tgt->shadow_len = bp_tgt->placed_size;
- readbuf = alloca (bp_tgt->placed_size);
- val = target_read_memory (bp_tgt->placed_address, readbuf,
- bp_tgt->placed_size);
+ bp_tgt->shadow_len = bplen;
+ readbuf = alloca (bplen);
+ val = target_read_memory (addr, readbuf, bplen);
if (val == 0)
{
- memcpy (bp_tgt->shadow_contents, readbuf, bp_tgt->placed_size);
- val = target_write_raw_memory (bp_tgt->placed_address, bp,
- bp_tgt->placed_size);
+ memcpy (bp_tgt->shadow_contents, readbuf, bplen);
+ val = target_write_raw_memory (addr, bp, bplen);
}
return val;
{
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 || bp_tgt->placed_size != bplen)
+ 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;
+}