diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2006-06-05 17:31:50 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2006-06-05 17:31:50 +0000 |
| commit | 51e512468b4d0fd390c7908fd8f8f595a96abe74 (patch) | |
| tree | 3af500844a8abd228a69fcd8be11900c9bb6c943 /gdb/remote.c | |
| parent | d4c12eb725acb0a4f9659804686b998dd98878f6 (diff) | |
| download | binutils-gdb-csl-arm-2006q1-6.tar.gz binutils-gdb-csl-arm-2006q1-6.tar.bz2 binutils-gdb-csl-arm-2006q1-6.zip | |
* gdb/remote.c (remote_insert_watchpoint): Return -1, rather thangdb-csl-sourcerygxx-4_1-6gdb-csl-arm-2006q1-6
fatal error if packet is disabled.
(remote_remove_watchpoint, remote_insert_hw_breakpoint,
remote_remove_hw_breakpoint): Likewise.
Revert my 2006-06-01 Nathan Sidwell <nathan@codesourcery.com>
change to breakpoint.c
Diffstat (limited to 'gdb/remote.c')
| -rw-r--r-- | gdb/remote.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index 4602635f262..599bb2189ba 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -4670,9 +4670,7 @@ remote_insert_watchpoint (CORE_ADDR addr, int len, int type) enum Z_packet_type packet = watchpoint_to_Z_packet (type); if (remote_protocol_packets[PACKET_Z0 + packet].support == PACKET_DISABLE) - error (_("Can't set hardware watchpoints without the '%s' (%s) packet."), - remote_protocol_packets[PACKET_Z0 + packet].name, - remote_protocol_packets[PACKET_Z0 + packet].title); + return -1; sprintf (buf, "Z%x,", packet); p = strchr (buf, '\0'); @@ -4705,10 +4703,8 @@ remote_remove_watchpoint (CORE_ADDR addr, int len, int type) enum Z_packet_type packet = watchpoint_to_Z_packet (type); if (remote_protocol_packets[PACKET_Z0 + packet].support == PACKET_DISABLE) - error (_("Can't clear hardware watchpoints without the '%s' (%s) packet."), - remote_protocol_packets[PACKET_Z0 + packet].name, - remote_protocol_packets[PACKET_Z0 + packet].title); - + return -1; + sprintf (buf, "z%x,", packet); p = strchr (buf, '\0'); addr = remote_address_masked (addr); @@ -4796,10 +4792,8 @@ remote_insert_hw_breakpoint (CORE_ADDR addr, gdb_byte *shadow) BREAKPOINT_FROM_PC (&addr, &len); if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE) - error (_("Can't set hardware breakpoint without the '%s' (%s) packet."), - remote_protocol_packets[PACKET_Z1].name, - remote_protocol_packets[PACKET_Z1].title); - + return -1; + *(p++) = 'Z'; *(p++) = '1'; *(p++) = ','; @@ -4838,9 +4832,7 @@ remote_remove_hw_breakpoint (CORE_ADDR addr, gdb_byte *shadow) BREAKPOINT_FROM_PC (&addr, &len); if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE) - error (_("Can't clear hardware breakpoint without the '%s' (%s) packet."), - remote_protocol_packets[PACKET_Z1].name, - remote_protocol_packets[PACKET_Z1].title); + return -1; *(p++) = 'z'; *(p++) = '1'; |