diff options
Diffstat (limited to 'tools/lldb-mi/MICmdCmdMiscellanous.cpp')
| -rw-r--r-- | tools/lldb-mi/MICmdCmdMiscellanous.cpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/tools/lldb-mi/MICmdCmdMiscellanous.cpp b/tools/lldb-mi/MICmdCmdMiscellanous.cpp index 4e4e1b986e8a..37cae404ad7d 100644 --- a/tools/lldb-mi/MICmdCmdMiscellanous.cpp +++ b/tools/lldb-mi/MICmdCmdMiscellanous.cpp @@ -7,20 +7,10 @@ // //===----------------------------------------------------------------------===// -//++ -// File: MICmdCmdMiscellanous.cpp -// // Overview: CMICmdCmdGdbExit implementation. // CMICmdCmdListThreadGroups implementation. // CMICmdCmdInterpreterExec implementation. // CMICmdCmdInferiorTtySet implementation. -// -// Environment: Compilers: Visual C++ 12. -// gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1 -// Libraries: See MIReadmetxt. -// -// Copyright: None. -//-- // Third Party Headers: #include "lldb/API/SBCommandInterpreter.h" @@ -84,7 +74,7 @@ bool CMICmdCmdGdbExit::Execute(void) { CMICmnLLDBDebugger::Instance().GetDriver().SetExitApplicationFlag(true); - const lldb::SBError sbErr = m_rLLDBDebugSessionInfo.GetProcess().Detach(); + const lldb::SBError sbErr = m_rLLDBDebugSessionInfo.GetProcess().Destroy(); // Do not check for sbErr.Fail() here, m_lldbProcess is likely !IsValid() return MIstatus::success; @@ -249,7 +239,7 @@ CMICmdCmdListThreadGroups::Execute(void) if (thread.IsValid()) { CMICmnMIValueTuple miTuple; - if (!rSessionInfo.MIResponseFormThreadInfo2(m_cmdData, thread, miTuple)) + if (!rSessionInfo.MIResponseFormThreadInfo(m_cmdData, thread, CMICmnLLDBDebugSessionInfo::eThreadInfoFormat_NoFrames, miTuple)) return MIstatus::failure; m_vecMIValueTuple.push_back(miTuple); @@ -340,8 +330,8 @@ CMICmdCmdListThreadGroups::Acknowledge(void) if (rSessionInfo.GetTarget().IsValid()) { lldb::SBTarget sbTrgt = rSessionInfo.GetTarget(); - const MIchar *pDir = sbTrgt.GetExecutable().GetDirectory(); - const MIchar *pFileName = sbTrgt.GetExecutable().GetFilename(); + const char *pDir = sbTrgt.GetExecutable().GetDirectory(); + const char *pFileName = sbTrgt.GetExecutable().GetFilename(); const CMIUtilString strFile(CMIUtilString::Format("%s/%s", pDir, pFileName)); const CMICmnMIValueConst miValueConst4(strFile); const CMICmnMIValueResult miValueResult4("executable", miValueConst4); @@ -409,7 +399,7 @@ CMICmdCmdListThreadGroups::CreateSelf(void) // Throws: None. //-- CMICmdCmdInterpreterExec::CMICmdCmdInterpreterExec(void) - : m_constStrArgNamedInterpreter("intepreter") + : m_constStrArgNamedInterpreter("interpreter") , m_constStrArgNamedCommand("command") { // Command factory matches this name with that received from the stdin stream @@ -493,19 +483,12 @@ CMICmdCmdInterpreterExec::Acknowledge(void) CMIUtilString strMsg(m_lldbResult.GetOutput()); strMsg = strMsg.StripCREndOfLine(); CMICmnStreamStdout::TextToStdout(strMsg); - - // Send the LLDB result message to console so the user can see the result of the - // command they typed. It is not necessary an error message. - CMICmnStreamStderr::LLDBMsgToConsole(strMsg); } if (m_lldbResult.GetErrorSize() > 0) { CMIUtilString strMsg(m_lldbResult.GetError()); strMsg = strMsg.StripCREndOfLine(); CMICmnStreamStderr::LLDBMsgToConsole(strMsg); - - // Send LLDB's error message to the MI Driver's Log file - CMICmnStreamStdout::TextToStdout(strMsg); } const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done); |