Downloafy/suyu-forked
1
0
Fork 1
forked from suyu/suyu
Code Pull requests 1 Activity

ldr: Simplify memory copy within LoadNro()

Browse source 
We can use the dedicated memory function for performing copies instead
of reading into a temporary buffer and then immediately writing it back
out to memory.

Eliminates a bit of heap memory churn.
This commit is contained in:
Lioncash 2021-05-06 19:18:11 -04:00
parent 860d73637e
commit 8f638e81e9
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/service/ldr/ldr.cpp
View file

@ -387,11 +387,9 @@ public:
const VAddr bss_end_addr{ const VAddr bss_end_addr{
Common::AlignUp(bss_start + nro_header.bss_size, Kernel::PageSize)}; Common::AlignUp(bss_start + nro_header.bss_size, Kernel::PageSize)};
auto CopyCode{[&](VAddr src_addr, VAddr dst_addr, u64 size) { const auto CopyCode = [this, process](VAddr src_addr, VAddr dst_addr, u64 size) {
std::vector<u8> source_data(size); system.Memory().CopyBlock(*process, dst_addr, src_addr, size);
system.Memory().ReadBlock(src_addr, source_data.data(), source_data.size()); };
system.Memory().WriteBlock(dst_addr, source_data.data(), source_data.size());
}};
CopyCode(nro_addr + nro_header.segment_headers[TEXT_INDEX].memory_offset, text_start, CopyCode(nro_addr + nro_header.segment_headers[TEXT_INDEX].memory_offset, text_start,
nro_header.segment_headers[TEXT_INDEX].memory_size); nro_header.segment_headers[TEXT_INDEX].memory_size);
CopyCode(nro_addr + nro_header.segment_headers[RO_INDEX].memory_offset, ro_start, CopyCode(nro_addr + nro_header.segment_headers[RO_INDEX].memory_offset, ro_start,