diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-20 22:37:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 22:37:58 -0400 |
| commit | e76f442a0e926299f19a5805aa37dc465a6fe5ef (patch) | |
| tree | 1cbc5dc5068e8db354dc3753f135ce9cf89d4194 /src/core/hle/kernel/process.cpp | |
| parent | 43b83d6b6a96c113d9036f01c48c021cb3561f72 (diff) | |
| parent | 8f454a5c68dd7901d8abf595e0cfa50a10d1b918 (diff) | |
Merge pull request #2268 from lioncash/codeset
core/kernel: Migrate CodeSet to its own source files
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 65c51003d..15a16ae14 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -9,6 +9,7 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/file_sys/program_metadata.h" +#include "core/hle/kernel/code_set.h" #include "core/hle/kernel/errors.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/process.h" @@ -50,9 +51,6 @@ void SetupMainThread(Process& owner_process, KernelCore& kernel, VAddr entry_poi } } // Anonymous namespace -CodeSet::CodeSet() = default; -CodeSet::~CodeSet() = default; - SharedPtr<Process> Process::Create(Core::System& system, std::string&& name) { auto& kernel = system.Kernel(); @@ -212,7 +210,7 @@ void Process::FreeTLSSlot(VAddr tls_address) { } void Process::LoadModule(CodeSet module_, VAddr base_addr) { - const auto MapSegment = [&](CodeSet::Segment& segment, VMAPermission permissions, + const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, MemoryState memory_state) { const auto vma = vm_manager .MapMemoryBlock(segment.addr + base_addr, module_.memory, |
