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.h | |
| 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.h')
| -rw-r--r-- | src/core/hle/kernel/process.h | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 47ffd4ad3..3ae7c922c 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -7,7 +7,6 @@ #include <array> #include <bitset> #include <cstddef> -#include <memory> #include <string> #include <vector> #include <boost/container/static_vector.hpp> @@ -33,6 +32,8 @@ class KernelCore; class ResourceLimit; class Thread; +struct CodeSet; + struct AddressMapping { // Address and size must be page-aligned VAddr address; @@ -65,46 +66,6 @@ enum class ProcessStatus { DebugBreak, }; -struct CodeSet final { - struct Segment { - std::size_t offset = 0; - VAddr addr = 0; - u32 size = 0; - }; - - explicit CodeSet(); - ~CodeSet(); - - Segment& CodeSegment() { - return segments[0]; - } - - const Segment& CodeSegment() const { - return segments[0]; - } - - Segment& RODataSegment() { - return segments[1]; - } - - 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 = 0; -}; - class Process final : public WaitObject { public: enum : u64 { |
