From 571dd61707032dd543738c7d3b6de91fda3d3138 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Fri, 15 Apr 2005 20:55:56 +0000 Subject: [PATCH] * remote.c (remote_get_thread_local_address): Throw a more meaningful exception when remote target doesn't have support for the qGetTLSAddr packet. --- gdb/ChangeLog | 6 ++++++ gdb/remote.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 98aedfc..60fd193 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2005-04-15 Kevin Buettner + * remote.c (remote_get_thread_local_address): Throw a more + meaningful exception when remote target doesn't have support + for the qGetTLSAddr packet. + +2005-04-15 Kevin Buettner + * remote.c (remote_protocol_qGetTLSAddr): New static global variable. (set_remote_protocol_qGetTLSAddr_packet_cmd) (show_remote_protocol_qGetTLSAddr_packet_cmd) diff --git a/gdb/remote.c b/gdb/remote.c index 99b6421..9116617 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5344,6 +5344,7 @@ remote_get_thread_local_address (ptid_t ptid, CORE_ADDR lm, CORE_ADDR offset) struct remote_state *rs = get_remote_state (); char *buf = alloca (rs->remote_packet_size); char *p = buf; + enum packet_result result; strcpy (p, "qGetTLSAddr:"); p += strlen (p); @@ -5356,13 +5357,21 @@ remote_get_thread_local_address (ptid_t ptid, CORE_ADDR lm, CORE_ADDR offset) putpkt (buf); getpkt (buf, rs->remote_packet_size, 0); - if (packet_ok (buf, &remote_protocol_qGetTLSAddr) == PACKET_OK) + result = packet_ok (buf, &remote_protocol_qGetTLSAddr); + if (result == PACKET_OK) { ULONGEST result; unpack_varlen_hex (buf, &result); return result; } + else if (result == PACKET_UNKNOWN) + { + struct exception e + = { RETURN_ERROR, TLS_GENERIC_ERROR, + "Remote target doesn't support qGetTLSAddr packet" }; + throw_exception (e); + } else { struct exception e -- 2.7.4