intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-14 03:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb][nfc] Change ProcessGDBRemote::ParseMultiMemReadPacket signature (#172020)

Browse Source 
Instead of returning an `Expected<vector<...>>` it now returns an Error,
and receives a vector argument to fill in. This will be useful to
support a change were ParseMultiMemReadPacket will be called multiple
times in a loop with the same vector; without this change, we would have
to concatenate vectors and copy memory around.
This commit is contained in:
Felipe de Azevedo Piovezan
2025-12-12 16:07:09 +00:00
committed by GitHub
parent 44c0469e5f
commit 66f2b6625e
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
View File

@@ -2807,15 +2807,14 @@ ProcessGDBRemote::ReadMemoryRanges(
llvm::StringRef response_str = response->GetStringRef();
const unsigned expected_num_ranges = ranges.size();
llvm::Expected<llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>>
parsed_response =
ParseMultiMemReadPacket(response_str, buffer, expected_num_ranges);
if (!parsed_response) {
LLDB_LOG_ERROR(GetLog(GDBRLog::Process), parsed_response.takeError(),
llvm::SmallVector<llvm::MutableArrayRef<uint8_t>> memory_regions;
if (llvm::Error error = ParseMultiMemReadPacket(
response_str, buffer, expected_num_ranges, memory_regions)) {
LLDB_LOG_ERROR(GetLog(GDBRLog::Process), std::move(error),
"MultiMemRead error parsing response: {0}");
return Process::ReadMemoryRanges(ranges, buffer);
}
return std::move(*parsed_response);
return memory_regions;
}
llvm::Expected<StringExtractorGDBRemote>
@@ -2851,10 +2850,10 @@ ProcessGDBRemote::SendMultiMemReadPacket(
return response;
}
llvm::Expected<llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>>
ProcessGDBRemote::ParseMultiMemReadPacket(llvm::StringRef response_str,
llvm::MutableArrayRef<uint8_t> buffer,
unsigned expected_num_ranges) {
llvm::Error ProcessGDBRemote::ParseMultiMemReadPacket(
llvm::StringRef response_str, llvm::MutableArrayRef<uint8_t> buffer,
unsigned expected_num_ranges,
llvm::SmallVectorImpl<llvm::MutableArrayRef<uint8_t>> &memory_regions) {
// The sizes and the data are separated by a `;`.
auto [sizes_str, memory_data] = response_str.split(';');
if (sizes_str.size() == response_str.size())
@@ -2862,8 +2861,6 @@ ProcessGDBRemote::ParseMultiMemReadPacket(llvm::StringRef response_str,
"MultiMemRead response missing field separator ';' in: '{0}'",
response_str));
llvm::SmallVector<llvm::MutableArrayRef<uint8_t>> read_results;
// Sizes are separated by a `,`.
for (llvm::StringRef size_str : llvm::split(sizes_str, ',')) {
uint64_t read_size;
@@ -2886,10 +2883,10 @@ ProcessGDBRemote::ParseMultiMemReadPacket(llvm::StringRef response_str,
buffer = buffer.drop_front(read_size);
memcpy(region_to_write.data(), region_to_read.data(), read_size);
read_results.push_back(region_to_write);
memory_regions.push_back(region_to_write);
}
return read_results;
return llvm::Error::success();
}
bool ProcessGDBRemote::SupportsMemoryTagging() {

8
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
View File

@@ -147,10 +147,10 @@ private:
llvm::Expected<StringExtractorGDBRemote>
SendMultiMemReadPacket(llvm::ArrayRef<Range<lldb::addr_t, size_t>> ranges);
llvm::Expected<llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>>
ParseMultiMemReadPacket(llvm::StringRef response_str,
llvm::MutableArrayRef<uint8_t> buffer,
unsigned expected_num_ranges);
llvm::Error ParseMultiMemReadPacket(
llvm::StringRef response_str, llvm::MutableArrayRef<uint8_t> buffer,
unsigned expected_num_ranges,
llvm::SmallVectorImpl<llvm::MutableArrayRef<uint8_t>> &memory_regions);
public:
Status