diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2012-07-30 15:05:43 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2012-07-30 15:05:43 +0000 |
| commit | fcf303aba3608fe6a3d359f43e3cd52715481825 (patch) | |
| tree | d773a44edee9d2d48556bddf0b2235681cccfe02 /gdb/gdbserver | |
| parent | 4e969b4f01286290f5d06e41dd8e8a2c738d7650 (diff) | |
| download | gdb-fcf303aba3608fe6a3d359f43e3cd52715481825.zip gdb-fcf303aba3608fe6a3d359f43e3cd52715481825.tar.gz gdb-fcf303aba3608fe6a3d359f43e3cd52715481825.tar.bz2 | |
ChangeLog:
* arm-linux-nat.c (arm_linux_hw_breakpoint_initialize): Do not
attempt to 4-byte-align HW breakpoint addresses for Thumb.
gdbserver/ChangeLog:
* linux-arm-low.c (arm_linux_hw_point_initialize): Do not attempt
to 4-byte-align HW breakpoint addresses for Thumb.
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-arm-low.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 9875796..08a8d3a 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2012-07-30 Ulrich Weigand <ulrich.weigand@linaro.org> + + * linux-arm-low.c (arm_linux_hw_point_initialize): Do not attempt + to 4-byte-align HW breakpoint addresses for Thumb. + 2012-07-27 Yao Qi <yao@codesourcery.com> PR remote/14161. diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index c4d2000..1037083 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -474,17 +474,17 @@ arm_linux_hw_point_initialize (char type, CORE_ADDR addr, int len, { case 2: /* 16-bit Thumb mode breakpoint */ case 3: /* 32-bit Thumb mode breakpoint */ - mask = 0x3 << (addr & 2); + mask = 0x3; + addr &= ~1; break; case 4: /* 32-bit ARM mode breakpoint */ mask = 0xf; + addr &= ~3; break; default: /* Unsupported. */ return -1; } - - addr &= ~3; } else { |