mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
gdbstub: add missing library list command
This commit is contained in:
parent
5c0a31e29f
commit
2f2e443858
1 changed files with 28 additions and 22 deletions
|
@ -422,6 +422,18 @@ static std::string GetThreadState(const Kernel::KThread* thread) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static std::string PaginateBuffer(std::string_view buffer, std::string_view request) {
|
||||||
|
const auto amount{request.substr(request.find(',') + 1)};
|
||||||
|
const auto offset_val{static_cast<u64>(strtoll(request.data(), nullptr, 16))};
|
||||||
|
const auto amount_val{static_cast<u64>(strtoll(amount.data(), nullptr, 16))};
|
||||||
|
|
||||||
|
if (offset_val + amount_val > buffer.size()) {
|
||||||
|
return fmt::format("l{}", buffer.substr(offset_val));
|
||||||
|
} else {
|
||||||
|
return fmt::format("m{}", buffer.substr(offset_val, amount_val));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GDBStub::HandleQuery(std::string_view command) {
|
void GDBStub::HandleQuery(std::string_view command) {
|
||||||
if (command.starts_with("TStatus")) {
|
if (command.starts_with("TStatus")) {
|
||||||
// no tracepoint support
|
// no tracepoint support
|
||||||
|
@ -430,18 +442,8 @@ void GDBStub::HandleQuery(std::string_view command) {
|
||||||
SendReply("PacketSize=4000;qXfer:features:read+;qXfer:threads:read+;qXfer:libraries:read+;"
|
SendReply("PacketSize=4000;qXfer:features:read+;qXfer:threads:read+;qXfer:libraries:read+;"
|
||||||
"vContSupported+;QStartNoAckMode+");
|
"vContSupported+;QStartNoAckMode+");
|
||||||
} else if (command.starts_with("Xfer:features:read:target.xml:")) {
|
} else if (command.starts_with("Xfer:features:read:target.xml:")) {
|
||||||
const auto offset{command.substr(30)};
|
|
||||||
const auto amount{command.substr(command.find(',') + 1)};
|
|
||||||
|
|
||||||
const auto offset_val{static_cast<u64>(strtoll(offset.data(), nullptr, 16))};
|
|
||||||
const auto amount_val{static_cast<u64>(strtoll(amount.data(), nullptr, 16))};
|
|
||||||
const auto target_xml{arch->GetTargetXML()};
|
const auto target_xml{arch->GetTargetXML()};
|
||||||
|
SendReply(PaginateBuffer(target_xml, command.substr(30)));
|
||||||
if (offset_val + amount_val > target_xml.size()) {
|
|
||||||
SendReply("l" + target_xml.substr(offset_val));
|
|
||||||
} else {
|
|
||||||
SendReply("m" + target_xml.substr(offset_val, amount_val));
|
|
||||||
}
|
|
||||||
} else if (command.starts_with("Offsets")) {
|
} else if (command.starts_with("Offsets")) {
|
||||||
Loader::AppLoader::Modules modules;
|
Loader::AppLoader::Modules modules;
|
||||||
system.GetAppLoader().ReadNSOModules(modules);
|
system.GetAppLoader().ReadNSOModules(modules);
|
||||||
|
@ -454,6 +456,20 @@ void GDBStub::HandleQuery(std::string_view command) {
|
||||||
SendReply(fmt::format("TextSeg={:x}",
|
SendReply(fmt::format("TextSeg={:x}",
|
||||||
system.CurrentProcess()->PageTable().GetCodeRegionStart()));
|
system.CurrentProcess()->PageTable().GetCodeRegionStart()));
|
||||||
}
|
}
|
||||||
|
} else if (command.starts_with("Xfer:libraries:read::")) {
|
||||||
|
Loader::AppLoader::Modules modules;
|
||||||
|
system.GetAppLoader().ReadNSOModules(modules);
|
||||||
|
|
||||||
|
std::string buffer;
|
||||||
|
buffer += R"(<?xml version="1.0"?>)";
|
||||||
|
buffer += "<library-list>";
|
||||||
|
for (const auto& [base, name] : modules) {
|
||||||
|
buffer += fmt::format(R"(<library name="{}"><segment address="{:#x}"/></library>)",
|
||||||
|
EscapeXML(name), base);
|
||||||
|
}
|
||||||
|
buffer += "</library-list>";
|
||||||
|
|
||||||
|
SendReply(PaginateBuffer(buffer, command.substr(21)));
|
||||||
} else if (command.starts_with("fThreadInfo")) {
|
} else if (command.starts_with("fThreadInfo")) {
|
||||||
// beginning of list
|
// beginning of list
|
||||||
const auto& threads = system.GlobalSchedulerContext().GetThreadList();
|
const auto& threads = system.GlobalSchedulerContext().GetThreadList();
|
||||||
|
@ -484,17 +500,7 @@ void GDBStub::HandleQuery(std::string_view command) {
|
||||||
|
|
||||||
buffer += "</threads>";
|
buffer += "</threads>";
|
||||||
|
|
||||||
const auto offset{command.substr(19)};
|
SendReply(PaginateBuffer(buffer, command.substr(19)));
|
||||||
const auto amount{command.substr(command.find(',') + 1)};
|
|
||||||
|
|
||||||
const auto offset_val{static_cast<u64>(strtoll(offset.data(), nullptr, 16))};
|
|
||||||
const auto amount_val{static_cast<u64>(strtoll(amount.data(), nullptr, 16))};
|
|
||||||
|
|
||||||
if (offset_val + amount_val > buffer.size()) {
|
|
||||||
SendReply("l" + buffer.substr(offset_val));
|
|
||||||
} else {
|
|
||||||
SendReply("m" + buffer.substr(offset_val, amount_val));
|
|
||||||
}
|
|
||||||
} else if (command.starts_with("Attached")) {
|
} else if (command.starts_with("Attached")) {
|
||||||
SendReply("0");
|
SendReply("0");
|
||||||
} else if (command.starts_with("StartNoAckMode")) {
|
} else if (command.starts_with("StartNoAckMode")) {
|
||||||
|
|
Loading…
Reference in a new issue