diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-07 09:46:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 09:46:31 -0700 |
| commit | 8acf739b3fac78d25dc60e1a7d1252c05afadd57 (patch) | |
| tree | 9315d25e19c41422467bef9d4a3e5fb5dd3fbb87 /src | |
| parent | 260b841dc30e642d00cff993276f2d9dc91fe04c (diff) | |
| parent | 8f638e81e9d74eacb7b19c4350340605f703f38b (diff) | |
Merge pull request #6287 from lioncash/ldr-copy
ldr: Simplify memory copy within LoadNro()
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index c8bc60ad17..89f6f6a2a1 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -387,11 +387,9 @@ public: const VAddr bss_end_addr{ Common::AlignUp(bss_start + nro_header.bss_size, Kernel::PageSize)}; - auto CopyCode{[&](VAddr src_addr, VAddr dst_addr, u64 size) { - std::vector<u8> source_data(size); - system.Memory().ReadBlock(src_addr, source_data.data(), source_data.size()); - system.Memory().WriteBlock(dst_addr, source_data.data(), source_data.size()); - }}; + const auto CopyCode = [this, process](VAddr src_addr, VAddr dst_addr, u64 size) { + system.Memory().CopyBlock(*process, dst_addr, src_addr, size); + }; CopyCode(nro_addr + nro_header.segment_headers[TEXT_INDEX].memory_offset, text_start, nro_header.segment_headers[TEXT_INDEX].memory_size); CopyCode(nro_addr + nro_header.segment_headers[RO_INDEX].memory_offset, ro_start, |