[llvm-branch-commits] [lldb] [lldbremote] Implement support for MultiBreakpoint packet (PR #192919)
Felipe de Azevedo Piovezan via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Apr 27 00:48:18 PDT 2026
https://github.com/felipepiovezan updated https://github.com/llvm/llvm-project/pull/192919
>From df05297eadb89e87ffbf11c7949b651ad487bca0 Mon Sep 17 00:00:00 2001
From: Felipe de Azevedo Piovezan <fpiovezan at apple.com>
Date: Mon, 23 Mar 2026 09:26:32 +0000
Subject: [PATCH] [lldb-server] Implement support for MultiBreakpoint packet
This is fairly straightforward, thanks to the helper functions created
in the previous commit.
https://github.com/llvm/llvm-project/pull/192910
---
.../lldb/Utility/StringExtractorGDBRemote.h | 1 +
.../tools/lldb-server/gdbremote_testcase.py | 1 +
.../GDBRemoteCommunicationServerLLGS.cpp | 63 +++++++++++++++++++
.../GDBRemoteCommunicationServerLLGS.h | 2 +
.../Utility/StringExtractorGDBRemote.cpp | 2 +
.../multi-breakpoint/TestMultiBreakpoint.py | 1 -
6 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/lldb/include/lldb/Utility/StringExtractorGDBRemote.h b/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
index 439245fdc3083..9aeac03a54bee 100644
--- a/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
+++ b/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
@@ -172,6 +172,7 @@ class StringExtractorGDBRemote : public StringExtractor {
eServerPacketType_jLLDBTraceStop,
eServerPacketType_jLLDBTraceGetState,
eServerPacketType_jLLDBTraceGetBinaryData,
+ eServerPacketType_jMultiBreakpoint,
eServerPacketType_qMemTags, // read memory tags
eServerPacketType_QMemTags, // write memory tags
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
index c37b825ff954e..d9a31d3f14449 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -933,6 +933,7 @@ def add_qSupported_packets(self, client_features=[]):
"SupportedWatchpointTypes",
"SupportedCompressions",
"MultiMemRead",
+ "jMultiBreakpoint",
]
def parse_qSupported_response(self, context):
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
index f16ca517e0561..c08874ac0801b 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
@@ -218,6 +218,9 @@ void GDBRemoteCommunicationServerLLGS::RegisterPacketHandlers() {
RegisterMemberFunctionHandler(
StringExtractorGDBRemote::eServerPacketType_jLLDBTraceGetBinaryData,
&GDBRemoteCommunicationServerLLGS::Handle_jLLDBTraceGetBinaryData);
+ RegisterMemberFunctionHandler(
+ StringExtractorGDBRemote::eServerPacketType_jMultiBreakpoint,
+ &GDBRemoteCommunicationServerLLGS::Handle_jMultiBreakpoint);
RegisterMemberFunctionHandler(StringExtractorGDBRemote::eServerPacketType_g,
&GDBRemoteCommunicationServerLLGS::Handle_g);
@@ -3105,6 +3108,65 @@ GDBRemoteCommunicationServerLLGS::Handle_z(StringExtractorGDBRemote &packet) {
ExecuteRemoveBreakpoint(packet.GetStringRef()));
}
+GDBRemoteCommunication::PacketResult
+GDBRemoteCommunicationServerLLGS::Handle_jMultiBreakpoint(
+ StringExtractorGDBRemote &packet) {
+ llvm::StringRef packet_str = packet.GetStringRef();
+ if (!packet_str.consume_front("jMultiBreakpoint:"))
+ return SendIllFormedResponse(packet,
+ "Invalid jMultiBreakpoint packet prefix");
+
+ llvm::Expected<llvm::json::Value> parsed = llvm::json::parse(packet_str);
+ if (!parsed) {
+ llvm::consumeError(parsed.takeError());
+ return SendIllFormedResponse(packet,
+ "jMultiBreakpoint did not contain valid JSON");
+ }
+ llvm::json::Object *request_dict = parsed->getAsObject();
+ if (!request_dict)
+ return SendIllFormedResponse(
+ packet, "jMultiBreakpoint did not contain a JSON dictionary");
+
+ llvm::json::Array *request_array =
+ request_dict->getArray("breakpoint_requests");
+ if (!request_array)
+ return SendIllFormedResponse(
+ packet,
+ "jMultiBreakpoint did not contain a valid 'breakpoint_requests' field");
+
+ llvm::json::Array reply_array;
+ for (const llvm::json::Value &value : *request_array) {
+ std::optional<llvm::StringRef> request = value.getAsString();
+ if (!request)
+ return SendIllFormedResponse(packet,
+ "jMultiBreakpoint had a non-string entry");
+ BreakpointResult result = request->starts_with("Z")
+ ? ExecuteSetBreakpoint(*request)
+ : ExecuteRemoveBreakpoint(*request);
+ switch (result.kind) {
+ case BreakpointResult::Kind::OK:
+ reply_array.push_back("OK");
+ break;
+ case BreakpointResult::Kind::Error:
+ reply_array.push_back(llvm::formatv("E{0:X-2}", result.error_code).str());
+ break;
+ case BreakpointResult::Kind::IllFormed:
+ reply_array.push_back("E03");
+ break;
+ }
+ }
+
+ llvm::json::Object dict;
+ dict.try_emplace("results", std::move(reply_array));
+
+ StreamString stream;
+ stream.AsRawOstream() << llvm::json::Value(std::move(dict));
+ StringRef response_str = stream.GetString();
+ StreamGDBRemote response;
+ response.PutEscapedBytes(response_str.data(), response_str.size());
+ return SendPacketNoLock(response.GetString());
+}
+
GDBRemoteCommunication::PacketResult
GDBRemoteCommunicationServerLLGS::Handle_s(StringExtractorGDBRemote &packet) {
Log *log = GetLog(LLDBLog::Process | LLDBLog::Thread);
@@ -4320,6 +4382,7 @@ std::vector<std::string> GDBRemoteCommunicationServerLLGS::HandleFeatures(
"QListThreadsInStopReply+",
"qXfer:features:read+",
"QNonStop+",
+ "jMultiBreakpoint+",
});
// report server-only features
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h
index 449f0ca9ce808..ee4372adc0b40 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h
@@ -276,6 +276,8 @@ class GDBRemoteCommunicationServerLLGS
PacketResult Handle_T(StringExtractorGDBRemote &packet);
+ PacketResult Handle_jMultiBreakpoint(StringExtractorGDBRemote &packet);
+
void SetCurrentThreadID(lldb::tid_t tid);
lldb::tid_t GetCurrentThreadID() const;
diff --git a/lldb/source/Utility/StringExtractorGDBRemote.cpp b/lldb/source/Utility/StringExtractorGDBRemote.cpp
index 40b5d037d0463..17e36398fc218 100644
--- a/lldb/source/Utility/StringExtractorGDBRemote.cpp
+++ b/lldb/source/Utility/StringExtractorGDBRemote.cpp
@@ -330,6 +330,8 @@ StringExtractorGDBRemote::GetServerPacketType() const {
return eServerPacketType_jLLDBTraceGetState;
if (PACKET_STARTS_WITH("jLLDBTraceGetBinaryData:"))
return eServerPacketType_jLLDBTraceGetBinaryData;
+ if (PACKET_STARTS_WITH("jMultiBreakpoint:"))
+ return eServerPacketType_jMultiBreakpoint;
break;
case 'v':
diff --git a/lldb/test/API/functionalities/multi-breakpoint/TestMultiBreakpoint.py b/lldb/test/API/functionalities/multi-breakpoint/TestMultiBreakpoint.py
index cd1a165089e91..9fbd792dcb1c7 100644
--- a/lldb/test/API/functionalities/multi-breakpoint/TestMultiBreakpoint.py
+++ b/lldb/test/API/functionalities/multi-breakpoint/TestMultiBreakpoint.py
@@ -12,7 +12,6 @@
from lldbsuite.test.gdbclientutils import *
- at skipUnlessDarwin # Remove once lldbsever support is implemented.
@skipIfOutOfTreeDebugserver
@skipIf(archs=no_match(["x86_64", "arm64", "aarch64"]))
class TestMultiBreakpoint(TestBase):
More information about the llvm-branch-commits
mailing list