diff options
Diffstat (limited to 'contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp | 139 |
1 files changed, 59 insertions, 80 deletions
diff --git a/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp b/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp index 7f767e7..bc34833 100644 --- a/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp +++ b/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp @@ -39,9 +39,8 @@ // Return: None. // Throws: None. //-- -CMICmdCmdStackInfoDepth::CMICmdCmdStackInfoDepth(void) +CMICmdCmdStackInfoDepth::CMICmdCmdStackInfoDepth() : m_nThreadFrames(0) - , m_constStrArgThread("thread") , m_constStrArgMaxDepth("max-depth") { // Command factory matches this name with that received from the stdin stream @@ -58,7 +57,7 @@ CMICmdCmdStackInfoDepth::CMICmdCmdStackInfoDepth(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackInfoDepth::~CMICmdCmdStackInfoDepth(void) +CMICmdCmdStackInfoDepth::~CMICmdCmdStackInfoDepth() { } @@ -72,12 +71,10 @@ CMICmdCmdStackInfoDepth::~CMICmdCmdStackInfoDepth(void) // Throws: None. //-- bool -CMICmdCmdStackInfoDepth::ParseArgs(void) +CMICmdCmdStackInfoDepth::ParseArgs() { - bool bOk = - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgMaxDepth, false, false))); - return (bOk && ParseValidateCmdOptions()); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgMaxDepth, false, false)); + return ParseValidateCmdOptions(); } //++ ------------------------------------------------------------------------------------ @@ -90,7 +87,7 @@ CMICmdCmdStackInfoDepth::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackInfoDepth::Execute(void) +CMICmdCmdStackInfoDepth::Execute() { CMICMDBASE_GETOPTION(pArgThread, OptionLong, m_constStrArgThread); CMICMDBASE_GETOPTION(pArgMaxDepth, Number, m_constStrArgMaxDepth); @@ -121,7 +118,7 @@ CMICmdCmdStackInfoDepth::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackInfoDepth::Acknowledge(void) +CMICmdCmdStackInfoDepth::Acknowledge() { const CMIUtilString strDepth(CMIUtilString::Format("%d", m_nThreadFrames)); const CMICmnMIValueConst miValueConst(strDepth); @@ -141,7 +138,7 @@ CMICmdCmdStackInfoDepth::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackInfoDepth::CreateSelf(void) +CMICmdCmdStackInfoDepth::CreateSelf() { return new CMICmdCmdStackInfoDepth(); } @@ -157,7 +154,7 @@ CMICmdCmdStackInfoDepth::CreateSelf(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackInfoFrame::CMICmdCmdStackInfoFrame(void) +CMICmdCmdStackInfoFrame::CMICmdCmdStackInfoFrame() { // Command factory matches this name with that received from the stdin stream m_strMiCmd = "stack-info-frame"; @@ -173,7 +170,7 @@ CMICmdCmdStackInfoFrame::CMICmdCmdStackInfoFrame(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackInfoFrame::~CMICmdCmdStackInfoFrame(void) +CMICmdCmdStackInfoFrame::~CMICmdCmdStackInfoFrame() { } @@ -187,7 +184,7 @@ CMICmdCmdStackInfoFrame::~CMICmdCmdStackInfoFrame(void) // Throws: None. //-- bool -CMICmdCmdStackInfoFrame::ParseArgs(void) +CMICmdCmdStackInfoFrame::ParseArgs() { return ParseValidateCmdOptions(); } @@ -202,7 +199,7 @@ CMICmdCmdStackInfoFrame::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackInfoFrame::Execute(void) +CMICmdCmdStackInfoFrame::Execute() { CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance()); lldb::SBProcess sbProcess = rSessionInfo.GetProcess(); @@ -230,7 +227,7 @@ CMICmdCmdStackInfoFrame::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackInfoFrame::Acknowledge(void) +CMICmdCmdStackInfoFrame::Acknowledge() { const CMICmnMIValueResult miValueResult("frame", m_miValueTuple); const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult); @@ -248,7 +245,7 @@ CMICmdCmdStackInfoFrame::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackInfoFrame::CreateSelf(void) +CMICmdCmdStackInfoFrame::CreateSelf() { return new CMICmdCmdStackInfoFrame(); } @@ -264,9 +261,8 @@ CMICmdCmdStackInfoFrame::CreateSelf(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListFrames::CMICmdCmdStackListFrames(void) +CMICmdCmdStackListFrames::CMICmdCmdStackListFrames() : m_nThreadFrames(0) - , m_constStrArgThread("thread") , m_constStrArgFrameLow("low-frame") , m_constStrArgFrameHigh("high-frame") { @@ -284,7 +280,7 @@ CMICmdCmdStackListFrames::CMICmdCmdStackListFrames(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListFrames::~CMICmdCmdStackListFrames(void) +CMICmdCmdStackListFrames::~CMICmdCmdStackListFrames() { m_vecMIValueResult.clear(); } @@ -299,13 +295,11 @@ CMICmdCmdStackListFrames::~CMICmdCmdStackListFrames(void) // Throws: None. //-- bool -CMICmdCmdStackListFrames::ParseArgs(void) +CMICmdCmdStackListFrames::ParseArgs() { - bool bOk = - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true))); - return (bOk && ParseValidateCmdOptions()); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true)); + return ParseValidateCmdOptions(); } //++ ------------------------------------------------------------------------------------ @@ -318,7 +312,7 @@ CMICmdCmdStackListFrames::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackListFrames::Execute(void) +CMICmdCmdStackListFrames::Execute() { CMICMDBASE_GETOPTION(pArgThread, OptionLong, m_constStrArgThread); CMICMDBASE_GETOPTION(pArgFrameLow, Number, m_constStrArgFrameLow); @@ -377,7 +371,7 @@ CMICmdCmdStackListFrames::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackListFrames::Acknowledge(void) +CMICmdCmdStackListFrames::Acknowledge() { if (m_nThreadFrames == 0) { @@ -429,7 +423,7 @@ CMICmdCmdStackListFrames::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackListFrames::CreateSelf(void) +CMICmdCmdStackListFrames::CreateSelf() { return new CMICmdCmdStackListFrames(); } @@ -445,10 +439,9 @@ CMICmdCmdStackListFrames::CreateSelf(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListArguments::CMICmdCmdStackListArguments(void) +CMICmdCmdStackListArguments::CMICmdCmdStackListArguments() : m_bThreadInvalid(false) , m_miValueList(true) - , m_constStrArgThread("thread") , m_constStrArgPrintValues("print-values") , m_constStrArgFrameLow("low-frame") , m_constStrArgFrameHigh("high-frame") @@ -467,7 +460,7 @@ CMICmdCmdStackListArguments::CMICmdCmdStackListArguments(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListArguments::~CMICmdCmdStackListArguments(void) +CMICmdCmdStackListArguments::~CMICmdCmdStackListArguments() { } @@ -481,14 +474,12 @@ CMICmdCmdStackListArguments::~CMICmdCmdStackListArguments(void) // Throws: None. //-- bool -CMICmdCmdStackListArguments::ParseArgs(void) +CMICmdCmdStackListArguments::ParseArgs() { - bool bOk = - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true))); - return (bOk && ParseValidateCmdOptions()); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true)); + return ParseValidateCmdOptions(); } //++ ------------------------------------------------------------------------------------ @@ -501,7 +492,7 @@ CMICmdCmdStackListArguments::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackListArguments::Execute(void) +CMICmdCmdStackListArguments::Execute() { CMICMDBASE_GETOPTION(pArgThread, OptionLong, m_constStrArgThread); CMICMDBASE_GETOPTION(pArgPrintValues, PrintValues, m_constStrArgPrintValues); @@ -587,7 +578,7 @@ CMICmdCmdStackListArguments::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackListArguments::Acknowledge(void) +CMICmdCmdStackListArguments::Acknowledge() { if (m_bThreadInvalid) { @@ -616,7 +607,7 @@ CMICmdCmdStackListArguments::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackListArguments::CreateSelf(void) +CMICmdCmdStackListArguments::CreateSelf() { return new CMICmdCmdStackListArguments(); } @@ -632,11 +623,9 @@ CMICmdCmdStackListArguments::CreateSelf(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListLocals::CMICmdCmdStackListLocals(void) +CMICmdCmdStackListLocals::CMICmdCmdStackListLocals() : m_bThreadInvalid(false) , m_miValueList(true) - , m_constStrArgThread("thread") - , m_constStrArgFrame("frame") , m_constStrArgPrintValues("print-values") { // Command factory matches this name with that received from the stdin stream @@ -653,7 +642,7 @@ CMICmdCmdStackListLocals::CMICmdCmdStackListLocals(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListLocals::~CMICmdCmdStackListLocals(void) +CMICmdCmdStackListLocals::~CMICmdCmdStackListLocals() { } @@ -667,14 +656,10 @@ CMICmdCmdStackListLocals::~CMICmdCmdStackListLocals(void) // Throws: None. //-- bool -CMICmdCmdStackListLocals::ParseArgs(void) +CMICmdCmdStackListLocals::ParseArgs() { - bool bOk = - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true))); - return (bOk && ParseValidateCmdOptions()); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true)); + return ParseValidateCmdOptions(); } //++ ------------------------------------------------------------------------------------ @@ -687,7 +672,7 @@ CMICmdCmdStackListLocals::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackListLocals::Execute(void) +CMICmdCmdStackListLocals::Execute() { CMICMDBASE_GETOPTION(pArgThread, OptionLong, m_constStrArgThread); CMICMDBASE_GETOPTION(pArgFrame, OptionLong, m_constStrArgFrame); @@ -752,7 +737,7 @@ CMICmdCmdStackListLocals::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackListLocals::Acknowledge(void) +CMICmdCmdStackListLocals::Acknowledge() { if (m_bThreadInvalid) { @@ -781,7 +766,7 @@ CMICmdCmdStackListLocals::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackListLocals::CreateSelf(void) +CMICmdCmdStackListLocals::CreateSelf() { return new CMICmdCmdStackListLocals(); } @@ -797,11 +782,9 @@ CMICmdCmdStackListLocals::CreateSelf(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListVariables::CMICmdCmdStackListVariables(void) +CMICmdCmdStackListVariables::CMICmdCmdStackListVariables() : m_bThreadInvalid(false) , m_miValueList(true) - , m_constStrArgThread("thread") - , m_constStrArgFrame("frame") , m_constStrArgPrintValues("print-values") { // Command factory matches this name with that received from the stdin stream @@ -818,7 +801,7 @@ CMICmdCmdStackListVariables::CMICmdCmdStackListVariables(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackListVariables::~CMICmdCmdStackListVariables(void) +CMICmdCmdStackListVariables::~CMICmdCmdStackListVariables() { } @@ -832,14 +815,10 @@ CMICmdCmdStackListVariables::~CMICmdCmdStackListVariables(void) // Throws: None. //-- bool -CMICmdCmdStackListVariables::ParseArgs(void) +CMICmdCmdStackListVariables::ParseArgs() { - bool bOk = - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - bOk = bOk && m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true))); - return (bOk && ParseValidateCmdOptions()); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true)); + return ParseValidateCmdOptions(); } //++ ------------------------------------------------------------------------------------ @@ -852,7 +831,7 @@ CMICmdCmdStackListVariables::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackListVariables::Execute(void) +CMICmdCmdStackListVariables::Execute() { CMICMDBASE_GETOPTION(pArgThread, OptionLong, m_constStrArgThread); CMICMDBASE_GETOPTION(pArgFrame, OptionLong, m_constStrArgFrame); @@ -916,7 +895,7 @@ CMICmdCmdStackListVariables::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackListVariables::Acknowledge(void) +CMICmdCmdStackListVariables::Acknowledge() { if (m_bThreadInvalid) { @@ -945,7 +924,7 @@ CMICmdCmdStackListVariables::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackListVariables::CreateSelf(void) +CMICmdCmdStackListVariables::CreateSelf() { return new CMICmdCmdStackListVariables(); } @@ -961,9 +940,9 @@ CMICmdCmdStackListVariables::CreateSelf(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackSelectFrame::CMICmdCmdStackSelectFrame(void) +CMICmdCmdStackSelectFrame::CMICmdCmdStackSelectFrame() : m_bFrameInvalid(false) - , m_constStrArgFrame("frame") + , m_constStrArgFrameId("frame_id") { // Command factory matches this name with that received from the stdin stream m_strMiCmd = "stack-select-frame"; @@ -979,7 +958,7 @@ CMICmdCmdStackSelectFrame::CMICmdCmdStackSelectFrame(void) // Return: None. // Throws: None. //-- -CMICmdCmdStackSelectFrame::~CMICmdCmdStackSelectFrame(void) +CMICmdCmdStackSelectFrame::~CMICmdCmdStackSelectFrame() { } @@ -993,10 +972,10 @@ CMICmdCmdStackSelectFrame::~CMICmdCmdStackSelectFrame(void) // Throws: None. //-- bool -CMICmdCmdStackSelectFrame::ParseArgs(void) +CMICmdCmdStackSelectFrame::ParseArgs() { - bool bOk = m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrame, true, false))); - return (bOk && ParseValidateCmdOptions()); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameId, true, false)); + return ParseValidateCmdOptions(); } //++ ------------------------------------------------------------------------------------ @@ -1009,9 +988,9 @@ CMICmdCmdStackSelectFrame::ParseArgs(void) // Throws: None. //-- bool -CMICmdCmdStackSelectFrame::Execute(void) +CMICmdCmdStackSelectFrame::Execute() { - CMICMDBASE_GETOPTION(pArgFrame, Number, m_constStrArgFrame); + CMICMDBASE_GETOPTION(pArgFrame, Number, m_constStrArgFrameId); CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance()); lldb::SBThread sbThread = rSessionInfo.GetProcess().GetSelectedThread(); @@ -1037,7 +1016,7 @@ CMICmdCmdStackSelectFrame::Execute(void) // Throws: None. //-- bool -CMICmdCmdStackSelectFrame::Acknowledge(void) +CMICmdCmdStackSelectFrame::Acknowledge() { if (m_bFrameInvalid) { @@ -1066,7 +1045,7 @@ CMICmdCmdStackSelectFrame::Acknowledge(void) // Throws: None. //-- CMICmdBase * -CMICmdCmdStackSelectFrame::CreateSelf(void) +CMICmdCmdStackSelectFrame::CreateSelf() { return new CMICmdCmdStackSelectFrame(); } |
