Skip to content

[lldb] Support discontinuous functions in another Disasembler overload #130987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2025
Merged

[lldb] Support discontinuous functions in another Disasembler overload #130987

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f79d61
[lldb] Support discontinuous functions in another Disasembler overload
labath Mar 12, 2025
0b629e1
format
labath Mar 12, 2025
07e736d
name arguments
labath Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions lldb/source/Core/Disassembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,28 +552,46 @@ void Disassembler::PrintInstructions(Debugger &debugger, const ArchSpec &arch,

bool Disassembler::Disassemble(Debugger &debugger, const ArchSpec &arch,
StackFrame &frame, Stream &strm) {
AddressRange range;
constexpr const char *plugin_name = nullptr;
constexpr const char *flavor = nullptr;
constexpr const char *cpu = nullptr;
constexpr const char *features = nullptr;
constexpr bool mixed_source_and_assembly = false;
constexpr uint32_t num_mixed_context_lines = 0;
constexpr uint32_t options = 0;

SymbolContext sc(
frame.GetSymbolContext(eSymbolContextFunction | eSymbolContextSymbol));
if (sc.function) {
range = sc.function->GetAddressRange();
} else if (sc.symbol && sc.symbol->ValueIsAddress()) {
if (DisassemblerSP disasm_sp = DisassembleRange(
arch, plugin_name, flavor, cpu, features, *frame.CalculateTarget(),
sc.function->GetAddressRanges())) {
disasm_sp->PrintInstructions(debugger, arch, frame,
mixed_source_and_assembly,
num_mixed_context_lines, options, strm);
return true;
}
return false;
}

AddressRange range;
if (sc.symbol && sc.symbol->ValueIsAddress()) {
range.GetBaseAddress() = sc.symbol->GetAddressRef();
range.SetByteSize(sc.symbol->GetByteSize());
} else {
range.GetBaseAddress() = frame.GetFrameCodeAddress();
}

if (range.GetBaseAddress().IsValid() && range.GetByteSize() == 0)
range.SetByteSize(DEFAULT_DISASM_BYTE_SIZE);
if (range.GetBaseAddress().IsValid() && range.GetByteSize() == 0)
range.SetByteSize(DEFAULT_DISASM_BYTE_SIZE);

Disassembler::Limit limit = {Disassembler::Limit::Bytes,
range.GetByteSize()};
if (limit.value == 0)
limit.value = DEFAULT_DISASM_BYTE_SIZE;
Disassembler::Limit limit = {Disassembler::Limit::Bytes, range.GetByteSize()};
if (limit.value == 0)
limit.value = DEFAULT_DISASM_BYTE_SIZE;

return Disassemble(debugger, arch, nullptr, nullptr, nullptr, nullptr,
frame, range.GetBaseAddress(), limit, false, 0, 0, strm);
return Disassemble(debugger, arch, plugin_name, flavor, cpu, features, frame,
range.GetBaseAddress(), limit, mixed_source_and_assembly,
num_mixed_context_lines, options, strm);
}

Instruction::Instruction(const Address &address, AddressClass addr_class)
Expand Down