diff options
| author | 2021-05-06 19:18:11 -0400 | |
|---|---|---|
| committer | 2021-05-06 19:18:14 -0400 | |
| commit | 8f638e81e9d74eacb7b19c4350340605f703f38b (patch) | |
| tree | 0ad8bb4d73ed558c1b5752c6c759c82cb2172b96 | |
| parent | Merge pull request #6283 from lioncash/unused-fields (diff) | |
| download | yuzu-8f638e81e9d74eacb7b19c4350340605f703f38b.tar.gz yuzu-8f638e81e9d74eacb7b19c4350340605f703f38b.tar.xz yuzu-8f638e81e9d74eacb7b19c4350340605f703f38b.zip | |
ldr: Simplify memory copy within LoadNro()
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.
| -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 c8bc60ad1..89f6f6a2a 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp | |||
| @@ -387,11 +387,9 @@ public: | |||
| 387 | const VAddr bss_end_addr{ | 387 | const VAddr bss_end_addr{ |
| 388 | Common::AlignUp(bss_start + nro_header.bss_size, Kernel::PageSize)}; | 388 | Common::AlignUp(bss_start + nro_header.bss_size, Kernel::PageSize)}; |
| 389 | 389 | ||
| 390 | auto CopyCode{[&](VAddr src_addr, VAddr dst_addr, u64 size) { | 390 | const auto CopyCode = [this, process](VAddr src_addr, VAddr dst_addr, u64 size) { |
| 391 | std::vector<u8> source_data(size); | 391 | system.Memory().CopyBlock(*process, dst_addr, src_addr, size); |
| 392 | system.Memory().ReadBlock(src_addr, source_data.data(), source_data.size()); | 392 | }; |
| 393 | system.Memory().WriteBlock(dst_addr, source_data.data(), source_data.size()); | ||
| 394 | }}; | ||
| 395 | CopyCode(nro_addr + nro_header.segment_headers[TEXT_INDEX].memory_offset, text_start, | 393 | CopyCode(nro_addr + nro_header.segment_headers[TEXT_INDEX].memory_offset, text_start, |
| 396 | nro_header.segment_headers[TEXT_INDEX].memory_size); | 394 | nro_header.segment_headers[TEXT_INDEX].memory_size); |
| 397 | CopyCode(nro_addr + nro_header.segment_headers[RO_INDEX].memory_offset, ro_start, | 395 | CopyCode(nro_addr + nro_header.segment_headers[RO_INDEX].memory_offset, ro_start, |