summaryrefslogtreecommitdiff
path: root/src/core/loader/elf.cpp
diff options
context:
space:
mode:
authorGravatar Markus Wick2020-01-12 16:51:07 +0100
committerGravatar Markus Wick2020-01-18 08:29:19 +0100
commit7e94e544f40ee8fc58fdea7c71fe48d8edd6fcb6 (patch)
treed98500be6d85b3b32653180ba9021464403e400f /src/core/loader/elf.cpp
parentMerge pull request #3305 from ReinUsesLisp/point-size-program (diff)
downloadyuzu-7e94e544f40ee8fc58fdea7c71fe48d8edd6fcb6.tar.gz
yuzu-7e94e544f40ee8fc58fdea7c71fe48d8edd6fcb6.tar.xz
yuzu-7e94e544f40ee8fc58fdea7c71fe48d8edd6fcb6.zip
core/loaders: Simplify PhysicalMemory usage.
It is currently a std::vector, however we might want to replace it with a more fancy allocator. So we can't use the C++ iterators any more.
Diffstat (limited to 'src/core/loader/elf.cpp')
-rw-r--r--src/core/loader/elf.cpp3
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 }