diff options
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/code_set.h | 3 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/code_set.h b/src/core/hle/kernel/code_set.h index 834fd23d2..879957dcb 100644 --- a/src/core/hle/kernel/code_set.h +++ b/src/core/hle/kernel/code_set.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <cstddef> | 7 | #include <cstddef> |
| 8 | #include <memory> | ||
| 9 | #include <vector> | 8 | #include <vector> |
| 10 | 9 | ||
| 11 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| @@ -78,7 +77,7 @@ struct CodeSet final { | |||
| 78 | } | 77 | } |
| 79 | 78 | ||
| 80 | /// The overall data that backs this code set. | 79 | /// The overall data that backs this code set. |
| 81 | std::shared_ptr<std::vector<u8>> memory; | 80 | std::vector<u8> memory; |
| 82 | 81 | ||
| 83 | /// The segments that comprise this code set. | 82 | /// The segments that comprise this code set. |
| 84 | std::array<Segment, 3> segments; | 83 | std::array<Segment, 3> segments; |
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 0d782e4ba..87779a71c 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -210,11 +210,13 @@ void Process::FreeTLSSlot(VAddr tls_address) { | |||
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | void Process::LoadModule(CodeSet module_, VAddr base_addr) { | 212 | void Process::LoadModule(CodeSet module_, VAddr base_addr) { |
| 213 | const auto memory = std::make_shared<std::vector<u8>>(std::move(module_.memory)); | ||
| 214 | |||
| 213 | const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, | 215 | const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, |
| 214 | MemoryState memory_state) { | 216 | MemoryState memory_state) { |
| 215 | const auto vma = vm_manager | 217 | const auto vma = vm_manager |
| 216 | .MapMemoryBlock(segment.addr + base_addr, module_.memory, | 218 | .MapMemoryBlock(segment.addr + base_addr, memory, segment.offset, |
| 217 | segment.offset, segment.size, memory_state) | 219 | segment.size, memory_state) |
| 218 | .Unwrap(); | 220 | .Unwrap(); |
| 219 | vm_manager.Reprotect(vma, permissions); | 221 | vm_manager.Reprotect(vma, permissions); |
| 220 | }; | 222 | }; |