diff options
| -rw-r--r-- | lldb/include/lldb/Core/Disassembler.h | 4 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectDisassemble.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Core/Disassembler.cpp | 13 | ||||
| -rw-r--r-- | lldb/source/Target/StackFrame.cpp | 1 |
4 files changed, 16 insertions, 4 deletions
diff --git a/lldb/include/lldb/Core/Disassembler.h b/lldb/include/lldb/Core/Disassembler.h index 1fb70daf03c..a6d81acd5ba 100644 --- a/lldb/include/lldb/Core/Disassembler.h +++ b/lldb/include/lldb/Core/Disassembler.h @@ -113,6 +113,7 @@ public: const AddressRange &range, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm); static size_t @@ -122,6 +123,7 @@ public: SymbolContextList &sc_list, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm); static bool @@ -132,6 +134,7 @@ public: Module *module, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm); static bool @@ -140,6 +143,7 @@ public: const ExecutionContext &exe_ctx, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm); //------------------------------------------------------------------ diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp index f949030479b..a4dd5ac3805 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.cpp +++ b/lldb/source/Commands/CommandObjectDisassemble.cpp @@ -218,6 +218,7 @@ CommandObjectDisassemble::Execute NULL, // Module * m_options.show_mixed ? m_options.num_lines_context : 0, m_options.show_bytes, + m_options.raw, result.GetOutputStream())) { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -276,6 +277,7 @@ CommandObjectDisassemble::Execute range, m_options.show_mixed ? m_options.num_lines_context : 0, m_options.show_bytes, + m_options.raw, result.GetOutputStream())) { result.SetStatus (eReturnStatusSuccessFinishResult); diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp index 2c5e34aa90c..fa7f4833d99 100644 --- a/lldb/source/Core/Disassembler.cpp +++ b/lldb/source/Core/Disassembler.cpp @@ -63,6 +63,7 @@ Disassembler::Disassemble SymbolContextList &sc_list, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm ) { @@ -76,7 +77,7 @@ Disassembler::Disassemble break; if (sc.GetAddressRange(eSymbolContextFunction | eSymbolContextSymbol, range)) { - if (Disassemble (debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, strm)) + if (Disassemble (debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, raw, strm)) { ++success_count; strm.EOL(); @@ -96,6 +97,7 @@ Disassembler::Disassemble Module *module, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm ) { @@ -134,7 +136,8 @@ Disassembler::Disassemble exe_ctx, sc_list, num_mixed_context_lines, - show_bytes, + show_bytes, + raw, strm); } return false; @@ -175,6 +178,7 @@ Disassembler::Disassemble const AddressRange &disasm_range, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm ) { @@ -301,7 +305,7 @@ Disassembler::Disassemble strm.IndentMore (); strm.Indent(); size_t inst_byte_size = inst->GetByteSize(); - inst->Dump(&strm, true, show_bytes ? &data : NULL, offset, &exe_ctx, show_bytes); + inst->Dump(&strm, true, show_bytes ? &data : NULL, offset, &exe_ctx, raw); strm.EOL(); offset += inst_byte_size; @@ -334,6 +338,7 @@ Disassembler::Disassemble const ExecutionContext &exe_ctx, uint32_t num_mixed_context_lines, bool show_bytes, + bool raw, Stream &strm ) { @@ -358,7 +363,7 @@ Disassembler::Disassemble range.SetByteSize (DEFAULT_DISASM_BYTE_SIZE); } - return Disassemble(debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, strm); + return Disassemble(debugger, arch, exe_ctx, range, num_mixed_context_lines, show_bytes, raw, strm); } Instruction::Instruction(const Address &addr) : diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index 7aec5b884be..60931fcfbb3 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -261,6 +261,7 @@ StackFrame::Disassemble () exe_ctx, 0, false, + false, m_disassembly); if (m_disassembly.GetSize() == 0) return NULL; |
