diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-20 17:40:09 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-20 18:07:04 +0100 |
commit | 1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93 (patch) | |
tree | 3e133530a2ba4fe509c084d579bdd186b6525169 /src/core/hle/kernel/process.h | |
parent | Merge pull request #2264 from lioncash/linker (diff) | |
download | yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.tar yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.tar.gz yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.tar.bz2 yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.tar.lz yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.tar.xz yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.tar.zst yuzu-1b6bd9d6dff81666d15e193c9589ddb2eb7cbb93.zip |
Diffstat (limited to '')
-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 { |