diff options
| author | Pedro Alves <palves@redhat.com> | 2014-04-22 19:47:04 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2014-04-23 18:33:52 +0100 |
| commit | a4165e94f452b3137a1071a5034853a93a9de1a2 (patch) | |
| tree | 6df836db855c5b2464ef3a4c757d6be41252a135 /gdb/gdbserver/i386-low.h | |
| parent | b8acf843690988fa96123b3c54bc3850d874eb35 (diff) | |
| download | gdb-a4165e94f452b3137a1071a5034853a93a9de1a2.zip gdb-a4165e94f452b3137a1071a5034853a93a9de1a2.tar.gz gdb-a4165e94f452b3137a1071a5034853a93a9de1a2.tar.bz2 | |
gdbserver: decouple x86 watchpoint / hw breakpoint routines from Z packet numbers.
My main motivation here is moving in the direction of decoupling
insert_point/remove_point from packet numbers, though this bit alone
should make it a little bit easier to merge gdb/gdbserver/i386-low.c
and gdb/i386-nat.c (which are largely the same).
Tested on x86_64 Fedora 17, and cross built for i686-mingw32 too.
gdb/gdbserver/
2014-04-23 Pedro Alves <palves@redhat.com>
* i386-low.c: Don't include break-common.h here.
(i386_low_insert_watchpoint, i386_low_remove_watchpoint): Change
prototype to take target_hw_bp_type as argument instead of a Z
packet char.
* i386-low.h: Include break-common.h here.
(Z_packet_to_hw_type): Declare.
(i386_low_insert_watchpoint, i386_low_remove_watchpoint): Change
prototypes.
* linux-x86-low.c (x86_insert_point): Convert the packet number to
a target_hw_bp_type before calling i386_low_insert_watchpoint.
(x86_remove_point): Convert the packet number to a
target_hw_bp_type before calling i386_low_remove_watchpoint.
* win32-i386-low.c (i386_insert_point): Convert the packet number
to a target_hw_bp_type before calling i386_low_insert_watchpoint.
(i386_remove_point): Convert the packet number to a
target_hw_bp_type before calling i386_low_remove_watchpoint.
Diffstat (limited to 'gdb/gdbserver/i386-low.h')
| -rw-r--r-- | gdb/gdbserver/i386-low.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gdb/gdbserver/i386-low.h b/gdb/gdbserver/i386-low.h index 1a4e3cc..d91c90a 100644 --- a/gdb/gdbserver/i386-low.h +++ b/gdb/gdbserver/i386-low.h @@ -29,6 +29,11 @@ counts, and allow to watch regions up to 16 bytes long (32 bytes on 64 bit hosts). */ +#include "break-common.h" + +/* Map the protocol watchpoint type TYPE to enum target_hw_bp_type. */ + +enum target_hw_bp_type Z_packet_to_hw_type (char type); /* Debug registers' indices. */ #define DR_FIRSTADDR 0 @@ -58,16 +63,18 @@ extern void i386_low_init_dregs (struct i386_debug_reg_state *state); /* Insert a watchpoint to watch a memory region which starts at address ADDR and whose length is LEN bytes. Watch memory accesses - of the type TYPE_FROM_PACKET. Return 0 on success, -1 on failure. */ + of the type TYPE. Return 0 on success, -1 on failure. */ extern int i386_low_insert_watchpoint (struct i386_debug_reg_state *state, - char type_from_packet, CORE_ADDR addr, + enum target_hw_bp_type type, + CORE_ADDR addr, int len); /* Remove a watchpoint that watched the memory region which starts at address ADDR, whose length is LEN bytes, and for accesses of the - type TYPE_FROM_PACKET. Return 0 on success, -1 on failure. */ + type TYPE. Return 0 on success, -1 on failure. */ extern int i386_low_remove_watchpoint (struct i386_debug_reg_state *state, - char type_from_packet, CORE_ADDR addr, + enum target_hw_bp_type type, + CORE_ADDR addr, int len); /* Return non-zero if we can watch a memory region that starts at |