[Lldb-commits] [lldb] r280074 - Fix fallout from the GetNameColonValue() refactor (r280000)

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Aug 30 06:17:00 2016
New Revision: 280074

URL: http://llvm.org/viewvc/llvm-project?rev=280074&view=rev
Log:
Fix fallout from the GetNameColonValue() refactor (r280000)

This fixes the linux test suite.

Modified:
    lldb/trunk/source/Interpreter/Args.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

Modified: lldb/trunk/source/Interpreter/Args.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=280074&r1=280073&r2=280074&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/Args.cpp (original)
+++ lldb/trunk/source/Interpreter/Args.cpp Tue Aug 30 06:17:00 2016
@@ -848,6 +848,7 @@ Args::StringToBoolean (const char *s, bo
 bool
 Args::StringToBoolean(llvm::StringRef ref, bool fail_value, bool *success_ptr)
 {
+    ref = ref.trim();
     if (ref.equals_lower("false") ||
         ref.equals_lower("off") ||
         ref.equals_lower("no") ||
@@ -1125,14 +1126,14 @@ Args::StringToGenericRegister(llvm::Stri
                           .Case("fp", LLDB_REGNUM_GENERIC_FP)
                           .Cases("ra", "lr", LLDB_REGNUM_GENERIC_RA)
                           .Case("flags", LLDB_REGNUM_GENERIC_FLAGS)
-                          .Case("arg1\0", LLDB_REGNUM_GENERIC_ARG1)
-                          .Case("arg2\0", LLDB_REGNUM_GENERIC_ARG2)
-                          .Case("arg3\0", LLDB_REGNUM_GENERIC_ARG3)
-                          .Case("arg4\0", LLDB_REGNUM_GENERIC_ARG4)
-                          .Case("arg5\0", LLDB_REGNUM_GENERIC_ARG5)
-                          .Case("arg6\0", LLDB_REGNUM_GENERIC_ARG6)
-                          .Case("arg7\0", LLDB_REGNUM_GENERIC_ARG7)
-                          .Case("arg8\0", LLDB_REGNUM_GENERIC_ARG8)
+                          .Case("arg1", LLDB_REGNUM_GENERIC_ARG1)
+                          .Case("arg2", LLDB_REGNUM_GENERIC_ARG2)
+                          .Case("arg3", LLDB_REGNUM_GENERIC_ARG3)
+                          .Case("arg4", LLDB_REGNUM_GENERIC_ARG4)
+                          .Case("arg5", LLDB_REGNUM_GENERIC_ARG5)
+                          .Case("arg6", LLDB_REGNUM_GENERIC_ARG6)
+                          .Case("arg7", LLDB_REGNUM_GENERIC_ARG7)
+                          .Case("arg8", LLDB_REGNUM_GENERIC_ARG8)
                           .Default(LLDB_INVALID_REGNUM);
     return result;
 }

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp?rev=280074&r1=280073&r2=280074&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp Tue Aug 30 06:17:00 2016
@@ -1814,7 +1814,10 @@ GDBRemoteCommunicationClient::GetWatchpo
             while (response.GetNameColonValue(name, value))
             {
                 if (name.equals("num"))
+                {
                     value.getAsInteger(0, m_num_supported_hardware_watchpoints);
+                    num = m_num_supported_hardware_watchpoints;
+                }
             }
         }
         else