https://github.com/da-viper created
https://github.com/llvm/llvm-project/pull/144070
putting the function name is the dissassembly instruction messes up the
alignment making it less readable. put it instead with the comment.
This also aligns the opcodes and instruction to the left matching the cli
>From 152d34765ed22a41b808180ec97707180cc822af Mon Sep 17 00:00:00 2001
From: Ebuka Ezike <yerimy...@gmail.com>
Date: Fri, 13 Jun 2025 13:46:40 +0100
Subject: [PATCH] [lldb-dap] show function name in the instruction comment.
putting the function name is the dissassembly instruction messes up the
alignment making it less readable. put it instead with the comment.
---
.../Handler/DisassembleRequestHandler.cpp | 34 ++++++++-----------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
index d5878d18289d6..85214b84b5c9c 100644
--- a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
+++ b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
@@ -100,7 +100,7 @@ static DisassembledInstruction
ConvertSBInstructionToDisassembledInstruction(
const char *m = inst.GetMnemonic(target);
const char *o = inst.GetOperands(target);
- const char *c = inst.GetComment(target);
+ std::string c = inst.GetComment(target);
auto d = inst.GetData(target);
std::string bytes;
@@ -114,34 +114,30 @@ static DisassembledInstruction
ConvertSBInstructionToDisassembledInstruction(
DisassembledInstruction disassembled_inst;
disassembled_inst.address = inst_addr;
- disassembled_inst.instructionBytes =
- bytes.size() > 0 ? bytes.substr(0, bytes.size() - 1) : "";
- std::string instruction;
- llvm::raw_string_ostream si(instruction);
+ if (!bytes.empty()) // remove last whitespace
+ bytes.pop_back();
+ disassembled_inst.instructionBytes = std::move(bytes);
+
+ llvm::raw_string_ostream si(disassembled_inst.instruction);
+ si << llvm::formatv("{0,-7} {1,-25}", m, o);
- lldb::SBSymbol symbol = addr.GetSymbol();
// Only add the symbol on the first line of the function.
- if (symbol.IsValid() && symbol.GetStartAddress() == addr) {
- // If we have a valid symbol, append it as a label prefix for the first
- // instruction. This is so you can see the start of a function/callsite
- // in the assembly, at the moment VS Code (1.80) does not visualize the
- // symbol associated with the assembly instruction.
- si << (symbol.GetMangledName() != nullptr ? symbol.GetMangledName()
- : symbol.GetName())
- << ": ";
+ // in the comment section
+ if (lldb::SBSymbol symbol = addr.GetSymbol();
+ symbol.GetStartAddress() == addr) {
+ const llvm::StringRef sym_display_name = symbol.GetDisplayName();
+ c.append(" ");
+ c.append(sym_display_name);
if (resolve_symbols)
- disassembled_inst.symbol = symbol.GetDisplayName();
+ disassembled_inst.symbol = sym_display_name;
}
- si << llvm::formatv("{0,7} {1,12}", m, o);
- if (c && c[0]) {
+ if (!c.empty()) {
si << " ; " << c;
}
- disassembled_inst.instruction = std::move(instruction);
-
protocol::Source source = CreateSource(addr, target);
lldb::SBLineEntry line_entry = GetLineEntryForAddress(target, addr);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
