projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move sparc-sol-thread.c back into sol-thread.c.
[deliverable/binutils-gdb.git]
/
gdb
/
mem-break.c
diff --git
a/gdb/mem-break.c
b/gdb/mem-break.c
index 868649390118982186c92c8c8c8cbedfea27e850..74fd8dba8e1f00d7544019c6161d1e361c027943 100644
(file)
--- a/
gdb/mem-break.c
+++ b/
gdb/mem-break.c
@@
-1,7
+1,6
@@
/* Simulate breakpoints by patching locations in the target system, for GDB.
/* Simulate breakpoints by patching locations in the target system, for GDB.
- Copyright (C) 1990, 1991, 1992, 1993, 1995, 1997, 1998, 1999, 2000, 2002,
- 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1990-2013 Free Software Foundation, Inc.
Contributed by Cygnus Support. Written by John Gilmore.
Contributed by Cygnus Support. Written by John Gilmore.
@@
-21,14
+20,11
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* This file is only useful if BREAKPOINT_FROM_PC is set. If not, we
- punt. */
-
#include "symtab.h"
#include "breakpoint.h"
#include "inferior.h"
#include "target.h"
#include "symtab.h"
#include "breakpoint.h"
#include "inferior.h"
#include "target.h"
+#include "gdb_string.h"
/* Insert a breakpoint on targets that don't have any better
/* Insert a breakpoint on targets that don't have any better
@@
-41,48
+37,55
@@
BREAKPOINT_MAX). */
int
BREAKPOINT_MAX). */
int
-default_memory_insert_breakpoint (struct bp_target_info *bp_tgt)
+default_memory_insert_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
int val;
const unsigned char *bp;
{
int val;
const unsigned char *bp;
-
int bplen
;
+
gdb_byte *readbuf
;
/* Determine appropriate breakpoint contents and size for this address. */
bp = gdbarch_breakpoint_from_pc
/* Determine appropriate breakpoint contents and size for this address. */
bp = gdbarch_breakpoint_from_pc
- (
current_
gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
+ (gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
if (bp == NULL)
error (_("Software breakpoints not implemented for this target."));
if (bp == NULL)
error (_("Software breakpoints not implemented for this target."));
- /* Save the memory contents. */
+ /* Save the memory contents in the shadow_contents buffer and then
+ write the breakpoint instruction. */
bp_tgt->shadow_len = bp_tgt->placed_size;
bp_tgt->shadow_len = bp_tgt->placed_size;
- val = target_read_memory (bp_tgt->placed_address, bp_tgt->shadow_contents,
+ readbuf = alloca (bp_tgt->placed_size);
+ val = target_read_memory (bp_tgt->placed_address, readbuf,
bp_tgt->placed_size);
bp_tgt->placed_size);
-
- /* Write the breakpoint. */
if (val == 0)
if (val == 0)
- val = target_write_memory (bp_tgt->placed_address, bp,
- bp_tgt->placed_size);
+ {
+ memcpy (bp_tgt->shadow_contents, readbuf, bp_tgt->placed_size);
+ val = target_write_raw_memory (bp_tgt->placed_address, bp,
+ bp_tgt->placed_size);
+ }
return val;
}
int
return val;
}
int
-default_memory_remove_breakpoint (struct bp_target_info *bp_tgt)
+default_memory_remove_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
{
- return target_write_memory (bp_tgt->placed_address, bp_tgt->shadow_contents,
- bp_tgt->placed_size);
+ return target_write_
raw_
memory (bp_tgt->placed_address, bp_tgt->shadow_contents,
+
bp_tgt->placed_size);
}
int
}
int
-memory_insert_breakpoint (struct bp_target_info *bp_tgt)
+memory_insert_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
{
- return gdbarch_memory_insert_breakpoint (
current_
gdbarch, bp_tgt);
+ return gdbarch_memory_insert_breakpoint (gdbarch, bp_tgt);
}
int
}
int
-memory_remove_breakpoint (struct bp_target_info *bp_tgt)
+memory_remove_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
{
- return gdbarch_memory_remove_breakpoint (
current_
gdbarch, bp_tgt);
+ return gdbarch_memory_remove_breakpoint (gdbarch, bp_tgt);
}
}
This page took
0.024144 seconds
and
4
git commands to generate.