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
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index 995a82c..a1208e4 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -110,8 +110,7 @@
SymbolContextList &sc_list,
uint32_t num_instructions,
uint32_t num_mixed_context_lines,
- bool show_bytes,
- bool raw,
+ uint32_t options,
Stream &strm
)
{
@@ -134,8 +133,7 @@
range,
num_instructions,
num_mixed_context_lines,
- show_bytes,
- raw,
+ options,
strm))
{
++success_count;
@@ -157,8 +155,7 @@
Module *module,
uint32_t num_instructions,
uint32_t num_mixed_context_lines,
- bool show_bytes,
- bool raw,
+ uint32_t options,
Stream &strm
)
{
@@ -199,8 +196,7 @@
sc_list,
num_instructions,
num_mixed_context_lines,
- show_bytes,
- raw,
+ options,
strm);
}
return false;
@@ -242,8 +238,7 @@
const AddressRange &disasm_range,
uint32_t num_instructions,
uint32_t num_mixed_context_lines,
- bool show_bytes,
- bool raw,
+ uint32_t options,
Stream &strm
)
{
@@ -267,8 +262,7 @@
exe_ctx,
num_instructions,
num_mixed_context_lines,
- show_bytes,
- raw,
+ options,
strm);
}
}
@@ -285,8 +279,7 @@
const Address &start_address,
uint32_t num_instructions,
uint32_t num_mixed_context_lines,
- bool show_bytes,
- bool raw,
+ uint32_t options,
Stream &strm
)
{
@@ -307,8 +300,7 @@
exe_ctx,
num_instructions,
num_mixed_context_lines,
- show_bytes,
- raw,
+ options,
strm);
}
}
@@ -324,8 +316,7 @@
const ExecutionContext &exe_ctx,
uint32_t num_instructions,
uint32_t num_mixed_context_lines,
- bool show_bytes,
- bool raw,
+ uint32_t options,
Stream &strm
)
{
@@ -384,7 +375,7 @@
sc.line_entry.line,
num_mixed_context_lines,
num_mixed_context_lines,
- num_mixed_context_lines ? "->" : "",
+ ((options & eOptionShowCurrentLine) ? "->" : ""),
&strm);
}
}
@@ -421,6 +412,8 @@
else
strm.PutCString(" ");
}
+ const bool show_bytes = (options & eOptionShowBytes) != 0;
+ const bool raw = (options & eOptionRawOuput) != 0;
inst->Dump(&strm, max_opcode_byte_size, true, show_bytes, &exe_ctx, raw);
strm.EOL();
}
@@ -443,8 +436,7 @@
const ExecutionContext &exe_ctx,
uint32_t num_instructions,
uint32_t num_mixed_context_lines,
- bool show_bytes,
- bool raw,
+ uint32_t options,
Stream &strm
)
{
@@ -476,8 +468,7 @@
range,
num_instructions,
num_mixed_context_lines,
- show_bytes,
- raw,
+ options,
strm);
}