diff options
| author | Markus Wick <markus@selfnet.de> | 2020-01-12 16:51:07 +0100 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2020-01-18 08:29:19 +0100 |
| commit | b8b3264c31496d45eac5cbd267d4a81011762f08 (patch) | |
| tree | d98500be6d85b3b32653180ba9021464403e400f /src/core/loader/kip.cpp | |
| parent | 726029a9ae7d1b280fb55a8b2dbe1a72aceff84f (diff) | |
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/kip.cpp')
| -rw-r--r-- | src/core/loader/kip.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp index 474b55cb13..092103abed 100644 --- a/src/core/loader/kip.cpp +++ b/src/core/loader/kip.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <cstring> #include "core/file_sys/kernel_executable.h" #include "core/file_sys/program_metadata.h" #include "core/gdbstub/gdbstub.h" @@ -76,8 +77,8 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::Process& process) { segment.addr = offset; segment.offset = offset; segment.size = PageAlignSize(static_cast<u32>(data.size())); - program_image.resize(offset); - program_image.insert(program_image.end(), data.begin(), data.end()); + program_image.resize(offset + data.size()); + std::memcpy(program_image.data() + offset, data.data(), data.size()); }; load_segment(codeset.CodeSegment(), kip->GetTextSection(), kip->GetTextOffset()); |
