Author: jingham Date: Tue Sep 10 14:58:22 2019 New Revision: 371560 URL: http://llvm.org/viewvc/llvm-project?rev=371560&view=rev Log: Fix a thinko in handling the QSetLogging packet.
The comparison against LOG_MEMORY shortcut all the LOG_MEMORY_* log channels. It has to come last. Modified: lldb/trunk/tools/debugserver/source/RNBRemote.cpp Modified: lldb/trunk/tools/debugserver/source/RNBRemote.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/RNBRemote.cpp?rev=371560&r1=371559&r2=371560&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/RNBRemote.cpp (original) +++ lldb/trunk/tools/debugserver/source/RNBRemote.cpp Tue Sep 10 14:58:22 2019 @@ -2091,9 +2091,6 @@ rnb_err_t set_logging(const char *p) { } else if (strncmp(p, "LOG_SHLIB", sizeof("LOG_SHLIB") - 1) == 0) { p += sizeof("LOG_SHLIB") - 1; bitmask |= LOG_SHLIB; - } else if (strncmp(p, "LOG_MEMORY", sizeof("LOG_MEMORY") - 1) == 0) { - p += sizeof("LOG_MEMORY") - 1; - bitmask |= LOG_MEMORY; } else if (strncmp(p, "LOG_MEMORY_DATA_SHORT", sizeof("LOG_MEMORY_DATA_SHORT") - 1) == 0) { p += sizeof("LOG_MEMORY_DATA_SHORT") - 1; @@ -2106,6 +2103,9 @@ rnb_err_t set_logging(const char *p) { sizeof("LOG_MEMORY_PROTECTIONS") - 1) == 0) { p += sizeof("LOG_MEMORY_PROTECTIONS") - 1; bitmask |= LOG_MEMORY_PROTECTIONS; + } else if (strncmp(p, "LOG_MEMORY", sizeof("LOG_MEMORY") - 1) == 0) { + p += sizeof("LOG_MEMORY") - 1; + bitmask |= LOG_MEMORY; } else if (strncmp(p, "LOG_BREAKPOINTS", sizeof("LOG_BREAKPOINTS") - 1) == 0) { p += sizeof("LOG_BREAKPOINTS") - 1; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits