Change the encoding of the triple string in the GDB-RSP from hex bytes to plain text

[mg11]

Summary

I changed the presentation of the triple's data to plain text in the GDBRemoteCommunicationServer.cpp, and modified it's decoding in GDBRemoteCommunicationClient.cpp accordingly. Have updated documentation in lldb-gdb-remote.txt to suit.

The rationale behind this change can be followed in http://lists.cs.uiuc.edu/pipermail/lldb-commits/Week-of-Mon-20140721/011948.html.

[tfiala]

Looks good, Matthew. If you can make sure that the tests run clean, that'd
be great. (I'm at an airport sans computer...)

Thanks!

-Todd

[mg11]

Thanks Todd!

Don't worry - I ran a linux test run with the python suite and I tested
lldb <-> lldb-debugserver interaction. Was fine.

have a good holiday!

Matt

Todd Fiala wrote:

Looks good, Matthew. If you can make sure that the tests run clean,
that'd be great. (I'm at an airport sans computer...)

Thanks!

-Todd

[tfiala]

Thanks much! Also the second message was meant to go to the non-review
thread but early-morning coffee deprivation has taken its toll :-)

[mg11]

Closed by commit rL214480 (authored by @mg11).

docs/lldb-gdb-remote.txt

 send packet: $qHostInfo#00
 read packet: $cputype:16777223;cpusubtype:3;ostype:darwin;vendor:apple;endian:little;ptrsize:8;#00
 
 Key value pairs are one of:
 
 cputype: is a number that is the mach-o CPU type that is being debugged (base 10)
 cpusubtype: is a number that is the mach-o CPU subtype type that is being debugged (base 10)
 triple: a string for the target triple (x86_64-apple-macosx) that can be used to specify arch + vendor + os in one entry
-The triple string must be sent as hexadecimal bytes, for the above example this being 7838365f36342d6170706c652d6d61636f7378 
 vendor: a string for the vendor (apple), not needed if "triple" is specified
 ostype: a string for the OS being debugged (darwin, linux, freebsd), not needed if "triple" is specified
 endian: is one of "little", "big", or "pdp"
 ptrsize: an unsigned number that represents how big pointers are in bytes on the debug target
 hostname: the hostname of the host that is running the GDB server if available
 os_build: a string for the the OS build for the remote host as a string value
 os_kernel: a string describing the kernel version
 os_version: a version string that represents the current OS version (10.8.2)

 //                          process ID
 //  "uid"         integer   A string value containing the decimal user ID
 //  "gid"         integer   A string value containing the decimal group ID
 //  "euid"        integer   A string value containing the decimal effective user ID
 //  "egid"        integer   A string value containing the decimal effective group ID
 //  "all_users"   bool      A boolean value that specifies if processes should
 //                          be listed for all users, not just the user that the 
 //                          platform is running as
-//  "triple"      ascii-hex An ASCII hex target triple string ("x86_64", 
+//  "triple"      string    An ASCII triple string ("x86_64", 
 //                          "x86_64-apple-macosx", "armv7-apple-ios")
 //
 // The response consists of key/value pairs where the key is separated from the
 // values with colons and each pair is terminated with a semi colon. For a list
 // of the key/value pairs in the response see the "qProcessInfoPID" packet
 // documentation.
 //
 // Sample packet/response:
 // send packet: $qfProcessInfo#00
-// read packet: $pid:60001;ppid:59948;uid:7746;gid:11;euid:7746;egid:11;name:6c6c6462;triple:7838365f36342d6170706c652d6d61636f7378;#00
+// read packet: $pid:60001;ppid:59948;uid:7746;gid:11;euid:7746;egid:11;name:6c6c6462;triple:x86_64-apple-macosx;#00
 // send packet: $qsProcessInfo#00
-// read packet: $pid:59992;ppid:192;uid:7746;gid:11;euid:7746;egid:11;name:6d64776f726b6572;triple:7838365f36342d6170706c652d6d61636f7378;#00
+// read packet: $pid:59992;ppid:192;uid:7746;gid:11;euid:7746;egid:11;name:6d64776f726b6572;triple:x86_64-apple-macosx;#00
 // send packet: $qsProcessInfo#00
 // read packet: $E04#00
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 // PLATFORM EXTENSION - for use as a GDB remote platform
 //----------------------------------------------------------------------

 //  ===========   ========  ================================================
 //  "pid"         integer   Process ID as a decimal integer string
 //  "ppid"        integer   Parent process ID as a decimal integer string
 //  "uid"         integer   A string value containing the decimal user ID
 //  "gid"         integer   A string value containing the decimal group ID
 //  "euid"        integer   A string value containing the decimal effective user ID
 //  "egid"        integer   A string value containing the decimal effective group ID
 //  "name"        ascii-hex An ASCII hex string that contains the name of the process
-//  "triple"      ascii-hex A target triple ("x86_64-apple-macosx", "armv7-apple-ios")
+//  "triple"      string    A target triple ("x86_64-apple-macosx", "armv7-apple-ios")
 //
 // Sample packet/response:
 // send packet: $qProcessInfoPID:60050#00
-// read packet: $pid:60050;ppid:59948;uid:7746;gid:11;euid:7746;egid:11;name:6c6c6462;triple:7838365f36342d6170706c652d6d61636f7378;#00
+// read packet: $pid:60050;ppid:59948;uid:7746;gid:11;euid:7746;egid:11;name:6c6c6462;triple:x86_64-apple-macosx;#00
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 // "vAttachName"
 //
 // BRIEF
 //  Same as vAttach, except instead of a "pid" you send a process name.
 //  

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

if (force || m_qHostInfo_is_valid == eLazyBoolCalculate)
                     }
                     else if (name.compare("arch") == 0)
                     {
                         arch_name.swap (value);
                         ++num_keys_decoded;
                     }
                     else if (name.compare("triple") == 0)
                     {
-                        // The triple comes as ASCII hex bytes since it contains '-' chars
-                        extractor.GetStringRef().swap(value);
-                        extractor.SetFilePos(0);
-                        extractor.GetHexByteString (triple);
+                        triple.swap(value);
                         ++num_keys_decoded;
                     }
                     else if (name.compare ("distribution_id") == 0)
                     {
                         extractor.GetStringRef ().swap (value);
                         extractor.SetFilePos (0);
                         extractor.GetHexByteString (distribution_id);
                         ++num_keys_decoded;
if (response.IsNormalResponse())
                 process_info.SetGroupID (Args::StringToUInt32 (value.c_str(), UINT32_MAX, 0));
             }
             else if (name.compare("egid") == 0)
             {
                 process_info.SetEffectiveGroupID (Args::StringToUInt32 (value.c_str(), UINT32_MAX, 0));
             }
             else if (name.compare("triple") == 0)
             {
-                // The triple comes as ASCII hex bytes since it contains '-' chars
-                extractor.GetStringRef().swap(value);
-                extractor.SetFilePos(0);
-                extractor.GetHexByteString (value);
                 process_info.GetArchitecture ().SetTriple (value.c_str());
             }
             else if (name.compare("name") == 0)
             {
                 StringExtractor extractor;
                 // The process name from ASCII hex bytes since we can't 
                 // control the characters in a process name
                 extractor.GetStringRef().swap(value);
if (m_supports_qfProcessInfo)
                 packet.Printf("egid:%u;",match_info.GetProcessInfo().GetEffectiveGroupID());
             if (match_info.GetProcessInfo().EffectiveGroupIDIsValid())
                 packet.Printf("all_users:%u;",match_info.GetMatchAllUsers() ? 1 : 0);
             if (match_info.GetProcessInfo().GetArchitecture().IsValid())
             {
                 const ArchSpec &match_arch = match_info.GetProcessInfo().GetArchitecture();
                 const llvm::Triple &triple = match_arch.GetTriple();
                 packet.PutCString("triple:");
-                packet.PutCStringAsRawHex8(triple.getTriple().c_str());
+                packet.PutCString(triple.getTriple().c_str());
                 packet.PutChar (';');
             }
         }
         StringExtractorGDBRemote response;
         if (SendPacketAndWaitForResponse (packet.GetData(), packet.GetSize(), response, false) == PacketResult::Success)
         {
             do
             {

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

 {
     StreamString response;
 
     // $cputype:16777223;cpusubtype:3;ostype:Darwin;vendor:apple;endian:little;ptrsize:8;#00
 
     ArchSpec host_arch (Host::GetArchitecture ());
     const llvm::Triple &host_triple = host_arch.GetTriple();
     response.PutCString("triple:");
-    response.PutCStringAsRawHex8(host_triple.getTriple().c_str());
+    response.PutCString(host_triple.getTriple().c_str());
     response.Printf (";ptrsize:%u;",host_arch.GetAddressByteSize());
 
     const char* distribution_id = host_arch.GetDistributionId ().AsCString ();
     if (distribution_id)
     {
         response.PutCString("distribution_id:");
         response.PutCStringAsRawHex8(distribution_id);
         response.PutCString(";");
CreateProcessInfoResponse (const ProcessInstanceInfo &proc_info, StreamString &response)
     response.PutCString ("name:");
     response.PutCStringAsRawHex8(proc_info.GetName());
     response.PutChar(';');
     const ArchSpec &proc_arch = proc_info.GetArchitecture();
     if (proc_arch.IsValid())
     {
         const llvm::Triple &proc_triple = proc_arch.GetTriple();
         response.PutCString("triple:");
-        response.PutCStringAsRawHex8(proc_triple.getTriple().c_str());
+        response.PutCString(proc_triple.getTriple().c_str());
         response.PutChar(';');
     }
 }
 
 static void
 CreateProcessInfoResponse_DebugServerStyle (const ProcessInstanceInfo &proc_info, StreamString &response)
 {
     response.Printf ("pid:%" PRIx64 ";parent-pid:%" PRIx64 ";real-uid:%x;real-gid:%x;effective-uid:%x;effective-gid:%x;",