From eee5e98658938e0902982d768069784f5c19e246 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Thu, 14 Feb 2013 18:39:30 +0000 Subject: [PATCH] Rename the monitor command from "qCmd" (incorrect) to "qRcmd". llvm-svn: 175191 --- lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp | 6 +++--- lldb/tools/debugserver/source/RNBRemote.cpp | 8 ++++---- lldb/tools/debugserver/source/RNBRemote.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 5ac3e03..96662f6 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -3157,8 +3157,8 @@ public: CommandObjectProcessGDBRemotePacketMonitor(CommandInterpreter &interpreter) : CommandObjectRaw (interpreter, "process plugin packet monitor", - "Send a qCmd packet through the GDB remote protocol and print the response." - "The argument passed to this command will be hex encoded into a valid 'qCmd' packet, sent and the response will be printed.", + "Send a qRcmd packet through the GDB remote protocol and print the response." + "The argument passed to this command will be hex encoded into a valid 'qRcmd' packet, sent and the response will be printed.", NULL) { } @@ -3181,7 +3181,7 @@ public: if (process) { StreamString packet; - packet.PutCString("qCmd,"); + packet.PutCString("qRcmd,"); packet.PutBytesAsRawHex8(command, strlen(command)); const char *packet_cstr = packet.GetString().c_str(); diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp index 2de6a9c..5177c0e 100644 --- a/lldb/tools/debugserver/source/RNBRemote.cpp +++ b/lldb/tools/debugserver/source/RNBRemote.cpp @@ -154,7 +154,7 @@ RNBRemote::CreatePacketTable () t.push_back (Packet (remove_read_watch_bp, &RNBRemote::HandlePacket_z, NULL, "z3", "Remove read watchpoint")); t.push_back (Packet (insert_access_watch_bp, &RNBRemote::HandlePacket_z, NULL, "Z4", "Insert access watchpoint")); t.push_back (Packet (remove_access_watch_bp, &RNBRemote::HandlePacket_z, NULL, "z4", "Remove access watchpoint")); - t.push_back (Packet (query_monitor, &RNBRemote::HandlePacket_qCmd, NULL, "qCmd", "Monitor command")); + t.push_back (Packet (query_monitor, &RNBRemote::HandlePacket_qRcmd, NULL, "qRcmd", "Monitor command")); t.push_back (Packet (query_current_thread_id, &RNBRemote::HandlePacket_qC, NULL, "qC", "Query current thread ID")); t.push_back (Packet (query_get_pid, &RNBRemote::HandlePacket_qGetPid, NULL, "qGetPid", "Query process id")); t.push_back (Packet (query_thread_ids_first, &RNBRemote::HandlePacket_qThreadInfo, NULL, "qfThreadInfo", "Get list of active threads (first req)")); @@ -1503,9 +1503,9 @@ extern void FileLogCallback(void *baton, uint32_t flags, const char *format, va_ extern void ASLLogCallback(void *baton, uint32_t flags, const char *format, va_list args); rnb_err_t -RNBRemote::HandlePacket_qCmd (const char *p) +RNBRemote::HandlePacket_qRcmd (const char *p) { - const char *c = p + strlen("qCmd,"); + const char *c = p + strlen("qRcmd,"); std::string line; while (c[0] && c[1]) { @@ -1513,7 +1513,7 @@ RNBRemote::HandlePacket_qCmd (const char *p) errno = 0; int ch = strtoul (smallbuf, NULL, 16); if (errno != 0 && ch == 0) - return HandlePacket_ILLFORMED (__FILE__, __LINE__, p, "non-hex char in payload of qCmd packet"); + return HandlePacket_ILLFORMED (__FILE__, __LINE__, p, "non-hex char in payload of qRcmd packet"); line.push_back(ch); c += 2; } diff --git a/lldb/tools/debugserver/source/RNBRemote.h b/lldb/tools/debugserver/source/RNBRemote.h index 77d596c..ab688a3 100644 --- a/lldb/tools/debugserver/source/RNBRemote.h +++ b/lldb/tools/debugserver/source/RNBRemote.h @@ -79,7 +79,7 @@ public: insert_access_watch_bp, // 'Z4' remove_access_watch_bp, // 'z4' - query_monitor, // 'qCmd' + query_monitor, // 'qRcmd' query_current_thread_id, // 'qC' query_get_pid, // 'qGetPid' query_thread_ids_first, // 'qfThreadInfo' @@ -166,7 +166,7 @@ public: rnb_err_t HandlePacket_A (const char *p); rnb_err_t HandlePacket_H (const char *p); rnb_err_t HandlePacket_qC (const char *p); - rnb_err_t HandlePacket_qCmd (const char *p); + rnb_err_t HandlePacket_qRcmd (const char *p); rnb_err_t HandlePacket_qGetPid (const char *p); rnb_err_t HandlePacket_qLaunchSuccess (const char *p); rnb_err_t HandlePacket_qRegisterInfo (const char *p); -- 2.7.4