diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-03-15 18:33:45 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-03-15 18:33:45 +0000 |
| commit | 35c63cd8ce5100859789b65ae76c6e5fe6ba47a4 (patch) | |
| tree | 06b0067bd7fe07eb48b194b63dc353aab092ec9a /gdb/m32r-tdep.c | |
| parent | 7b8957f8c3b4054061363abdc38bbbf0a3b20635 (diff) | |
| download | gdb-35c63cd8ce5100859789b65ae76c6e5fe6ba47a4.zip gdb-35c63cd8ce5100859789b65ae76c6e5fe6ba47a4.tar.gz gdb-35c63cd8ce5100859789b65ae76c6e5fe6ba47a4.tar.bz2 | |
Problem after hitting breakpoint on Windows (with GDBserver)
When debugging on Windows with GDBserver, the debugger starts
failing after hitting a breakpoint. For instance:
(gdb) b foo
Breakpoint 1 at 0x40177e: file foo.adb, line 5.
(gdb) cont
Continuing.
Breakpoint 1, foo () at foo.adb:5
5 Put_Line ("Hello World."); -- STOP
(gdb) n
Program received signal SIGSEGV, Segmentation fault.
0x00401782 in foo () at foo.adb:5
5 Put_Line ("Hello World."); -- STOP
There are two issues:
1. While trying to re-insert a breakpoint that is still inserted
in memory, insert_bp_location wipes out the breakpoint location's
shadow_contents. As a consequence, we cannot restore the proper
instruction when removing the breakpoint anymore. That's why
the inferior's behavior changes when trying to resume after
the breakpoint was hit.
2. mem-break.c:default_memory_insert_breakpoint passes a breakpoint
location's shadow_contents as the buffer for a memory read.
This reveals a limitation of the various memory-read target
functions. This patch documents this limitation and adjust
the two calls that seem to hit that limitation.
gdb/ChangeLog:
* breakpoint.c (breakpoint_xfer_memory): Add assertion.
Update function description.
(insert_bp_location): Do not wipe bl->target_info out.
* mem-break.c: #include "gdb_string.h".
(default_memory_insert_breakpoint): Do not call target_read_memory
with a pointer to the breakpoint's shadow_contents buffer. Use
a local buffer instead.
* m32r-tdep.c (m32r_memory_insert_breakpoint): Ditto.
Diffstat (limited to 'gdb/m32r-tdep.c')
| -rw-r--r-- | gdb/m32r-tdep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c index 72872bd..d504eb3 100644 --- a/gdb/m32r-tdep.c +++ b/gdb/m32r-tdep.c @@ -85,7 +85,7 @@ m32r_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr = bp_tgt->placed_address; int val; gdb_byte buf[4]; - gdb_byte *contents_cache = bp_tgt->shadow_contents; + gdb_byte contents_cache[4]; gdb_byte bp_entry[] = { 0x10, 0xf1 }; /* dpt */ /* Save the memory contents. */ @@ -93,6 +93,7 @@ m32r_memory_insert_breakpoint (struct gdbarch *gdbarch, if (val != 0) return val; /* return error */ + memcpy (bp_tgt->shadow_contents, contents_cache, 4); bp_tgt->placed_size = bp_tgt->shadow_len = 4; /* Determine appropriate breakpoint contents and size for this address. */ |