mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-23 18:56:03 +00:00
Code Issues Releases Activity

dmnt2: remove memory-map output which does nothing for us

Browse source
This commit is contained in:
Michael Scire 2021-11-01 12:43:18 -07:00
parent d2b024f19f
commit 95ef9da873
2 changed files with 0 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
stratosphere/dmnt.gen2/source/dmnt2_gdb_server_impl.cpp
View file

@ -772,7 +772,6 @@ namespace ams::dmnt {
AnnexBufferContents_Processes, AnnexBufferContents_Processes,
AnnexBufferContents_Threads, AnnexBufferContents_Threads,
AnnexBufferContents_Libraries, AnnexBufferContents_Libraries,
AnnexBufferContents_MemoryMap,
}; };
constinit AnnexBufferContents g_annex_buffer_contents = AnnexBufferContents_Invalid; constinit AnnexBufferContents g_annex_buffer_contents = AnnexBufferContents_Invalid;
@ -1954,7 +1953,6 @@ namespace ams::dmnt {
AppendReply(m_reply_packet, ";augmented-libraries-svr4-read+"); AppendReply(m_reply_packet, ";augmented-libraries-svr4-read+");
AppendReply(m_reply_packet, ";qXfer:threads:read+"); AppendReply(m_reply_packet, ";qXfer:threads:read+");
AppendReply(m_reply_packet, ";qXfer:exec-file:read+"); AppendReply(m_reply_packet, ";qXfer:exec-file:read+");
AppendReply(m_reply_packet, ";qXfer:memory-map:read+");
AppendReply(m_reply_packet, ";swbreak+"); AppendReply(m_reply_packet, ";swbreak+");
AppendReply(m_reply_packet, ";hwbreak+"); AppendReply(m_reply_packet, ";hwbreak+");
AppendReply(m_reply_packet, ";vContSupported+"); AppendReply(m_reply_packet, ";vContSupported+");
@ -1981,8 +1979,6 @@ namespace ams::dmnt {
} }
} else if (ParsePrefix(m_receive_packet, "libraries:read::")) { } else if (ParsePrefix(m_receive_packet, "libraries:read::")) {
this->qXferLibrariesRead(); this->qXferLibrariesRead();
} else if (ParsePrefix(m_receive_packet, "memory-map:read::")) {
this->qXferMemoryMapRead();
} else if (ParsePrefix(m_receive_packet, "exec-file:read:")) { } else if (ParsePrefix(m_receive_packet, "exec-file:read:")) {
SetReply(m_reply_packet, "l%s", m_debug_process.GetProcessName()); SetReply(m_reply_packet, "l%s", m_debug_process.GetProcessName());
} else { } else {
@ -2079,73 +2075,6 @@ namespace ams::dmnt {
GetAnnexBufferContents(m_reply_packet, offset, length); GetAnnexBufferContents(m_reply_packet, offset, length);
} }
void GdbServerImpl::qXferMemoryMapRead() {
/* Handle the qXfer. */
u32 offset, length;
/* Parse offset/length. */
ParseOffsetLength(m_receive_packet, offset, length);
/* Acquire access to the annex buffer. */
std::scoped_lock lk(g_annex_buffer_lock);
/* If doing a fresh read, generate the module list. */
if (offset == 0 || g_annex_buffer_contents != AnnexBufferContents_MemoryMap) {
/* Set header. */
SetReply(g_annex_buffer, "<memory-map>\n");
/* Iterate over all mappings. */
uintptr_t cur_addr = 0;
svc::MemoryInfo prev_info = {};
size_t prev_size = 0;
while (true) {
/* Get current mapping. */
svc::MemoryInfo mem_info;
if (R_FAILED(m_debug_process.QueryMemory(std::addressof(mem_info), cur_addr))) {
break;
}
/* If the mapping is present, add it. */
if (mem_info.state != svc::MemoryState_Free && mem_info.state != svc::MemoryState_Inaccessible && mem_info.permission != svc::MemoryPermission_None) {
if (prev_size != 0 && mem_info.state == prev_info.state && mem_info.permission == prev_info.permission && mem_info.attribute == prev_info.attribute && mem_info.base_address == prev_info.base_address + prev_size) {
prev_size += mem_info.size;
} else {
if (prev_size != 0) {
AppendReply(g_annex_buffer, "<memory type=\"ram\" start=\"0x%lx\" length=\"0x%lx\" />", prev_info.base_address, prev_size);
}
prev_info = mem_info;
prev_size = mem_info.size;
}
} else {
if (prev_size != 0) {
AppendReply(g_annex_buffer, "<memory type=\"ram\" start=\"0x%lx\" length=\"0x%lx\" />", prev_info.base_address, prev_size);
prev_size = 0;
}
}
const uintptr_t next_address = mem_info.base_address + mem_info.size;
if (next_address <= cur_addr) {
break;
}
cur_addr = next_address;
}
if (prev_size != 0) {
AppendReply(g_annex_buffer, "<memory type=\"ram\" start=\"0x%lx\" length=\"0x%lx\" />", prev_info.base_address, prev_size);
}
AppendReply(g_annex_buffer, "</memory-map>");
g_annex_buffer_contents = AnnexBufferContents_MemoryMap;
}
/* Copy out the module list. */
GetAnnexBufferContents(m_reply_packet, offset, length);
}
void GdbServerImpl::qXferOsdataRead() { void GdbServerImpl::qXferOsdataRead() {
/* Handle the qXfer. */ /* Handle the qXfer. */
u32 offset, length; u32 offset, length;

1
stratosphere/dmnt.gen2/source/dmnt2_gdb_server_impl.hpp
View file

@ -104,7 +104,6 @@ namespace ams::dmnt {
void qXfer(); void qXfer();
void qXferFeaturesRead(); void qXferFeaturesRead();
void qXferLibrariesRead(); void qXferLibrariesRead();
void qXferMemoryMapRead();
void qXferOsdataRead(); void qXferOsdataRead();
bool qXferThreadsRead(); bool qXferThreadsRead();