diff options
| author | 2015-05-08 17:53:19 -0300 | |
|---|---|---|
| committer | 2015-05-08 22:11:48 -0300 | |
| commit | 2f5904611dec1c2bf00f4c8d520e43bd4eff4c01 (patch) | |
| tree | 7f8a6933dbc680b240f0488d4c9f0bdbe8deba56 /src/core/hle/kernel/process.h | |
| parent | Loader/NCCH: Fix formatting of braces (diff) | |
| download | yuzu-2f5904611dec1c2bf00f4c8d520e43bd4eff4c01.tar.gz yuzu-2f5904611dec1c2bf00f4c8d520e43bd4eff4c01.tar.xz yuzu-2f5904611dec1c2bf00f4c8d520e43bd4eff4c01.zip | |
Process: Use BitField to store process flags
Diffstat (limited to 'src/core/hle/kernel/process.h')
| -rw-r--r-- | src/core/hle/kernel/process.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index d16979263..16151bb22 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | 8 | ||
| 9 | #include <boost/container/static_vector.hpp> | 9 | #include <boost/container/static_vector.hpp> |
| 10 | 10 | ||
| 11 | #include "common/bit_field.h" | ||
| 12 | #include "common/common_types.h" | ||
| 13 | |||
| 11 | #include "core/hle/kernel/kernel.h" | 14 | #include "core/hle/kernel/kernel.h" |
| 12 | #include "core/hle/result.h" | 15 | #include "core/hle/result.h" |
| 13 | 16 | ||
| @@ -21,12 +24,27 @@ struct StaticAddressMapping { | |||
| 21 | bool unk_flag; | 24 | bool unk_flag; |
| 22 | }; | 25 | }; |
| 23 | 26 | ||
| 24 | enum class MemoryRegion { | 27 | enum class MemoryRegion : u16 { |
| 25 | APPLICATION = 1, | 28 | APPLICATION = 1, |
| 26 | SYSTEM = 2, | 29 | SYSTEM = 2, |
| 27 | BASE = 3, | 30 | BASE = 3, |
| 28 | }; | 31 | }; |
| 29 | 32 | ||
| 33 | union ProcessFlags { | ||
| 34 | u16 raw; | ||
| 35 | |||
| 36 | BitField< 0, 1, u16> allow_debug; ///< Allows other processes to attach to and debug this process. | ||
| 37 | BitField< 1, 1, u16> force_debug; ///< Allows this process to attach to processes even if they don't have allow_debug set. | ||
| 38 | BitField< 2, 1, u16> allow_nonalphanum; | ||
| 39 | BitField< 3, 1, u16> shared_page_writable; ///< Shared page is mapped with write permissions. | ||
| 40 | BitField< 4, 1, u16> privileged_priority; ///< Can use priority levels higher than 24. | ||
| 41 | BitField< 5, 1, u16> allow_main_args; | ||
| 42 | BitField< 6, 1, u16> shared_device_mem; | ||
| 43 | BitField< 7, 1, u16> runnable_on_sleep; | ||
| 44 | BitField< 8, 4, MemoryRegion> memory_region; ///< Default region for memory allocations for this process | ||
| 45 | BitField<12, 1, u16> loaded_high; ///< Application loaded high (not at 0x00100000). | ||
| 46 | }; | ||
| 47 | |||
| 30 | class Process final : public Object { | 48 | class Process final : public Object { |
| 31 | public: | 49 | public: |
| 32 | static SharedPtr<Process> Create(std::string name, u64 program_id); | 50 | static SharedPtr<Process> Create(std::string name, u64 program_id); |
| @@ -43,11 +61,7 @@ public: | |||
| 43 | std::bitset<0x80> svc_access_mask; | 61 | std::bitset<0x80> svc_access_mask; |
| 44 | unsigned int handle_table_size = 0x200; | 62 | unsigned int handle_table_size = 0x200; |
| 45 | boost::container::static_vector<StaticAddressMapping, 8> static_address_mappings; // TODO: Determine a good upper limit | 63 | boost::container::static_vector<StaticAddressMapping, 8> static_address_mappings; // TODO: Determine a good upper limit |
| 46 | 64 | ProcessFlags flags; | |
| 47 | bool loaded_high = false; // Application loaded high (not at 0x00100000) | ||
| 48 | bool shared_page_writable = false; | ||
| 49 | bool privileged_priority = false; // Can use priority levels higher than 24 | ||
| 50 | MemoryRegion memory_region = MemoryRegion::APPLICATION; | ||
| 51 | 65 | ||
| 52 | void ParseKernelCaps(const u32* kernel_caps, size_t len); | 66 | void ParseKernelCaps(const u32* kernel_caps, size_t len); |
| 53 | void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size); | 67 | void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size); |