Move all MIProtocol methods implementations into commands.cpp

diff --git a/src/debug/netcoredbg/commands.cpp b/src/debug/netcoredbg/commands.cpp
index e574ded2d59ea397302e81efec534a296ecdf1fd..e634f7f0cfd5c8eb850382ce8822bfa1cb8c7f55 100644 (file)
--- a/src/debug/netcoredbg/commands.cpp
+++ b/src/debug/netcoredbg/commands.cpp
@@ -909,3 +909,44 @@ void MIProtocol::CommandLoop()
 
     Printf("%s^exit\n", token.c_str());
 }
+
+std::mutex MIProtocol::m_outMutex;
+
+void MIProtocol::Printf(const char *fmt, ...)
+{
+    std::lock_guard<std::mutex> lock(m_outMutex);
+    va_list arg;
+
+    va_start(arg, fmt);
+    vfprintf(stdout, fmt, arg);
+    va_end(arg);
+
+    fflush(stdout);
+}
+
+std::string MIProtocol::EscapeMIValue(const std::string &str)
+{
+    std::string s(str);
+
+    for (std::size_t i = 0; i < s.size(); ++i)
+    {
+        int count = 0;
+        char c = s.at(i);
+        switch (c)
+        {
+            case '\"': count = 1; s.insert(i, count, '\\'); s[i + count] = '\"'; break;
+            case '\\': count = 1; s.insert(i, count, '\\'); s[i + count] = '\\'; break;
+            case '\0': count = 1; s.insert(i, count, '\\'); s[i + count] = '0'; break;
+            case '\a': count = 1; s.insert(i, count, '\\'); s[i + count] = 'a'; break;
+            case '\b': count = 1; s.insert(i, count, '\\'); s[i + count] = 'b'; break;
+            case '\f': count = 1; s.insert(i, count, '\\'); s[i + count] = 'f'; break;
+            case '\n': count = 1; s.insert(i, count, '\\'); s[i + count] = 'n'; break;
+            case '\r': count = 1; s.insert(i, count, '\\'); s[i + count] = 'r'; break;
+            case '\t': count = 1; s.insert(i, count, '\\'); s[i + count] = 't'; break;
+            case '\v': count = 1; s.insert(i, count, '\\'); s[i + count] = 'v'; break;
+        }
+        i += count;
+    }
+
+    return s;
+}

diff --git a/src/debug/netcoredbg/manageddebugger.cpp b/src/debug/netcoredbg/manageddebugger.cpp
index b88d50b35a94be102d900fcd33682b076fdc020f..d4e4eeb37e7e62d31fed0a4f62c5ffe02cc1b52e 100644 (file)
--- a/src/debug/netcoredbg/manageddebugger.cpp
+++ b/src/debug/netcoredbg/manageddebugger.cpp
@@ -90,47 +90,6 @@ BOOL SafeReadMemory (TADDR offset, PVOID lpBuffer, ULONG cb,
     // return bRet;
 }
 
-std::mutex MIProtocol::m_outMutex;
-
-void MIProtocol::Printf(const char *fmt, ...)
-{
-    std::lock_guard<std::mutex> lock(m_outMutex);
-    va_list arg;
-
-    va_start(arg, fmt);
-    vfprintf(stdout, fmt, arg);
-    va_end(arg);
-
-    fflush(stdout);
-}
-
-std::string MIProtocol::EscapeMIValue(const std::string &str)
-{
-    std::string s(str);
-
-    for (std::size_t i = 0; i < s.size(); ++i)
-    {
-        int count = 0;
-        char c = s.at(i);
-        switch (c)
-        {
-            case '\"': count = 1; s.insert(i, count, '\\'); s[i + count] = '\"'; break;
-            case '\\': count = 1; s.insert(i, count, '\\'); s[i + count] = '\\'; break;
-            case '\0': count = 1; s.insert(i, count, '\\'); s[i + count] = '0'; break;
-            case '\a': count = 1; s.insert(i, count, '\\'); s[i + count] = 'a'; break;
-            case '\b': count = 1; s.insert(i, count, '\\'); s[i + count] = 'b'; break;
-            case '\f': count = 1; s.insert(i, count, '\\'); s[i + count] = 'f'; break;
-            case '\n': count = 1; s.insert(i, count, '\\'); s[i + count] = 'n'; break;
-            case '\r': count = 1; s.insert(i, count, '\\'); s[i + count] = 'r'; break;
-            case '\t': count = 1; s.insert(i, count, '\\'); s[i + count] = 't'; break;
-            case '\v': count = 1; s.insert(i, count, '\\'); s[i + count] = 'v'; break;
-        }
-        i += count;
-    }
-
-    return s;
-}
-
 static HRESULT DisableAllSteppersInAppDomain(ICorDebugAppDomain *pAppDomain)
 {
     HRESULT Status;