diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-04 08:17:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-04 08:17:25 +0200 |
commit | 206f2e3436a2c1dddee7503edc4e142fb9a9dbd4 (patch) | |
tree | 69c99523b435fe2c2bff9b022534035a9b4b4020 /src/core/hle | |
parent | Merge pull request #917 from lioncash/crash (diff) | |
parent | kernel/process: Use std::array where applicable (diff) | |
download | yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.tar yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.tar.gz yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.tar.bz2 yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.tar.lz yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.tar.xz yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.tar.zst yuzu-206f2e3436a2c1dddee7503edc4e142fb9a9dbd4.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/kernel/process.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/kernel/process.h | 45 |
2 files changed, 36 insertions, 15 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 5403ceef5..edf34c5a3 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -142,9 +142,9 @@ void Process::LoadModule(SharedPtr<CodeSet> module_, VAddr base_addr) { }; // Map CodeSet segments - MapSegment(module_->code, VMAPermission::ReadExecute, MemoryState::CodeStatic); - MapSegment(module_->rodata, VMAPermission::Read, MemoryState::CodeMutable); - MapSegment(module_->data, VMAPermission::ReadWrite, MemoryState::CodeMutable); + MapSegment(module_->CodeSegment(), VMAPermission::ReadExecute, MemoryState::CodeStatic); + MapSegment(module_->RODataSegment(), VMAPermission::Read, MemoryState::CodeMutable); + MapSegment(module_->DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeMutable); } ResultVal<VAddr> Process::HeapAllocate(VAddr target, u64 size, VMAPermission perms) { diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 98d8da35e..992689186 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -4,6 +4,7 @@ #pragma once +#include <array> #include <bitset> #include <cstddef> #include <memory> @@ -55,6 +56,12 @@ enum class ProcessStatus { Created, Running, Exited }; class ResourceLimit; struct CodeSet final : public Object { + struct Segment { + size_t offset = 0; + VAddr addr = 0; + u32 size = 0; + }; + static SharedPtr<CodeSet> Create(std::string name); std::string GetTypeName() const override { @@ -69,24 +76,38 @@ struct CodeSet final : public Object { return HANDLE_TYPE; } - /// Name of the process - std::string name; + Segment& CodeSegment() { + return segments[0]; + } - std::shared_ptr<std::vector<u8>> memory; + const Segment& CodeSegment() const { + return segments[0]; + } - struct Segment { - size_t offset = 0; - VAddr addr = 0; - u32 size = 0; - }; + Segment& RODataSegment() { + return segments[1]; + } - Segment segments[3]; - Segment& code = segments[0]; - Segment& rodata = segments[1]; - Segment& data = segments[2]; + const Segment& RODataSegment() const { + return segments[1]; + } + Segment& DataSegment() { + return segments[2]; + } + + const Segment& DataSegment() const { + return segments[2]; + } + + std::shared_ptr<std::vector<u8>> memory; + + std::array<Segment, 3> segments; VAddr entrypoint; + /// Name of the process + std::string name; + private: CodeSet(); ~CodeSet() override; |