diff options
| author | 2020-01-18 03:03:48 -0500 | |
|---|---|---|
| committer | 2020-01-18 03:03:48 -0500 | |
| commit | 278264b9e584d197ef4fcc15051190149e243a95 (patch) | |
| tree | 9ac5f757fb4dbb26272c2b169e0a33bc6164d4e9 /src/core/loader/elf.cpp | |
| parent | Merge pull request #3305 from ReinUsesLisp/point-size-program (diff) | |
| parent | core/memory: Create a special MapMemoryRegion for physical memory. (diff) | |
| download | yuzu-278264b9e584d197ef4fcc15051190149e243a95.tar.gz yuzu-278264b9e584d197ef4fcc15051190149e243a95.tar.xz yuzu-278264b9e584d197ef4fcc15051190149e243a95.zip | |
Merge pull request #3314 from degasus/physical_mem
core/hle/kernel: Simplify PhysicalMemory usages.
Diffstat (limited to 'src/core/loader/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index f1795fdd6..8908e5328 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -335,7 +335,8 @@ Kernel::CodeSet ElfReader::LoadInto(VAddr vaddr) { | |||
| 335 | codeset_segment->addr = segment_addr; | 335 | codeset_segment->addr = segment_addr; |
| 336 | codeset_segment->size = aligned_size; | 336 | codeset_segment->size = aligned_size; |
| 337 | 337 | ||
| 338 | memcpy(&program_image[current_image_position], GetSegmentPtr(i), p->p_filesz); | 338 | std::memcpy(program_image.data() + current_image_position, GetSegmentPtr(i), |
| 339 | p->p_filesz); | ||
| 339 | current_image_position += aligned_size; | 340 | current_image_position += aligned_size; |
| 340 | } | 341 | } |
| 341 | } | 342 | } |