Re: [RFC] remote.c: Add remote TLS support

[Kevin Buettner <kevinb@redhat.com>]

On Fri, 15 Apr 2005 16:12:00 -0400
Daniel Jacobowitz <drow@false.org> wrote:

> > +      if (packet_ok (buf, &remote_protocol_qGetTLSAddr) == PACKET_OK)
> > +	{
> > +	  ULONGEST result;
> > +
> > +	  unpack_varlen_hex (buf, &result);
> > +	  return result;
> > +	}
> > +      else
> > +	{
> > +	  struct exception e
> > +	    = { RETURN_ERROR, TLS_GENERIC_ERROR,
> > +		"Remote target failed to process qGetTLSAddr request" };
> > +	  throw_exception (e);
> > +
> > +	}
> > +    }
> > +  else
> > +    {
> > +      struct exception e
> > +	= { RETURN_ERROR, TLS_GENERIC_ERROR,
> > +	    "TLS not supported or disabled on this target" };
> > +      throw_exception (e);
> > +    }
> > +  /* Not reached.  */
> > +  return 0;
> > +}
> > +
> >  static void
> >  init_remote_ops (void)
> >  {
> 
> You're still throwing the wrong exception if the packet is autodetected
> as unavailable, as far as I can tell.  You'll throw the "failed to
> process" message.

I apologize for missing this in your earlier review.  I've checked the
following change in to handle this case.

	* remote.c (remote_get_thread_local_address): Throw a more
	meaningful exception when remote target doesn't have support
	for the qGetTLSAddr packet.

Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.182
diff -u -p -r1.182 remote.c
--- remote.c	15 Apr 2005 19:58:59 -0000	1.182
+++ remote.c	15 Apr 2005 20:45:26 -0000
@@ -5344,6 +5344,7 @@ remote_get_thread_local_address (ptid_t 
       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 
 
       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