diff options
| author | Jim Ingham <jingham@apple.com> | 2019-09-10 21:58:22 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2019-09-10 21:58:22 +0000 |
| commit | 6ca76ceb63bf91282d9bbcc2a1cad190455a3c5a (patch) | |
| tree | 55a669df004570ddd095675af3afb588a0c3832a /lldb/tools/debugserver/source/RNBRemote.cpp | |
| parent | c9f5aa99acbb89702b767831e56c549bbe5ad1d7 (diff) | |
| download | bcm5719-llvm-6ca76ceb63bf91282d9bbcc2a1cad190455a3c5a.tar.gz bcm5719-llvm-6ca76ceb63bf91282d9bbcc2a1cad190455a3c5a.zip | |
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.
llvm-svn: 371560
Diffstat (limited to 'lldb/tools/debugserver/source/RNBRemote.cpp')
| -rw-r--r-- | lldb/tools/debugserver/source/RNBRemote.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp index 513cbe10de0..61bdf0d8dac 100644 --- a/lldb/tools/debugserver/source/RNBRemote.cpp +++ b/lldb/tools/debugserver/source/RNBRemote.cpp @@ -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; |
