diff options
| author | Greg Clayton <gclayton@apple.com> | 2011-06-22 01:39:49 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2011-06-22 01:39:49 +0000 |
| commit | 1da6f9d7f1a62119cf83edc75cfe50461131d1b5 (patch) | |
| tree | 6111ef91bf52d325b1581f8e72ee3e4b3c527e5f /lldb/source/Commands/CommandObjectDisassemble.cpp | |
| parent | fe268d1045c45a0441e644f0d93b932f806bded1 (diff) | |
| download | bcm5719-llvm-1da6f9d7f1a62119cf83edc75cfe50461131d1b5.tar.gz bcm5719-llvm-1da6f9d7f1a62119cf83edc75cfe50461131d1b5.zip | |
Fixed an issue where SBFrame::GetDisassembly() was returning disassembly that
contained the current line marker. This is now an option which is not enabled
for the API disassembly call.
llvm-svn: 133597
Diffstat (limited to 'lldb/source/Commands/CommandObjectDisassemble.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectDisassemble.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp index 8c3744ff6bb..980c83c11c4 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.cpp +++ b/lldb/source/Commands/CommandObjectDisassemble.cpp @@ -258,6 +258,16 @@ CommandObjectDisassemble::Execute m_options.num_lines_context = 1; ExecutionContext exe_ctx(m_interpreter.GetExecutionContext()); + uint32_t options = 0; + + if (!m_options.show_mixed) + options |= Disassembler::eOptionShowCurrentLine; + + if (m_options.show_bytes) + options |= Disassembler::eOptionShowBytes; + + if (m_options.raw) + options |= Disassembler::eOptionRawOuput; if (!m_options.func_name.empty()) { @@ -271,8 +281,7 @@ CommandObjectDisassemble::Execute NULL, // Module * m_options.num_instructions, m_options.show_mixed ? m_options.num_lines_context : 0, - m_options.show_bytes, - m_options.raw, + options, result.GetOutputStream())) { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -369,8 +378,7 @@ CommandObjectDisassemble::Execute range.GetBaseAddress(), m_options.num_instructions, m_options.show_mixed ? m_options.num_lines_context : 0, - m_options.show_bytes, - m_options.raw, + options, result.GetOutputStream())) { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -413,8 +421,7 @@ CommandObjectDisassemble::Execute range, m_options.num_instructions, m_options.show_mixed ? m_options.num_lines_context : 0, - m_options.show_bytes, - m_options.raw, + options, result.GetOutputStream())) { result.SetStatus (eReturnStatusSuccessFinishResult); |
