From 6d60acf0f1afcae873988da5218f2f1c7bc9d151 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 4 May 2015 00:01:16 -0300 Subject: Kernel: Introduce skeleton Process class to hold process data --- src/core/hle/kernel/process.h | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/core/hle/kernel/process.h (limited to 'src/core/hle/kernel/process.h') diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h new file mode 100644 index 000000000..8abd881e3 --- /dev/null +++ b/src/core/hle/kernel/process.h @@ -0,0 +1,61 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +#include + +#include "core/hle/kernel/kernel.h" +#include "core/hle/result.h" + +namespace Kernel { + +struct StaticAddressMapping { + // Address and size must be 4K-aligned + VAddr address; + u32 size; + bool writable; +}; + +enum class MemoryRegion { + APPLICATION = 1, + SYSTEM = 2, + BASE = 3, +}; + +class Process final : public Object { +public: + static SharedPtr Create(std::string name, u64 program_id); + + std::string GetTypeName() const override { return "Process"; } + std::string GetName() const override { return name; } + + static const HandleType HANDLE_TYPE = HandleType::Process; + HandleType GetHandleType() const override { return HANDLE_TYPE; } + + std::string name; ///< Name of the process + u64 program_id; + + std::bitset<0x80> svc_access_mask; + unsigned int handle_table_size = 0x200; + boost::container::static_vector static_address_mappings; // TODO: Determine a good upper limit + + bool loaded_high = false; // Application loaded high (not at 0x00100000) + bool shared_page_writable = false; + bool privileged_priority = false; // Can use priority levels higher than 24 + MemoryRegion memory_region = MemoryRegion::APPLICATION; + + void ParseKernelCaps(const u32* kernel_caps, size_t len); + void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size); + +private: + Process(); + ~Process() override; +}; + +extern SharedPtr g_current_process; + +} -- cgit v1.2.3 From 2af30d465fa4e9c3421f01b557141673eb0a2115 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 8 May 2015 16:51:48 -0300 Subject: Process: Support parsing of exheader kernel caps --- src/core/hle/kernel/process.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/hle/kernel/process.h') diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 8abd881e3..d16979263 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -14,10 +14,11 @@ namespace Kernel { struct StaticAddressMapping { - // Address and size must be 4K-aligned + // Address and size must be page-aligned VAddr address; u32 size; bool writable; + bool unk_flag; }; enum class MemoryRegion { -- cgit v1.2.3 From 2f5904611dec1c2bf00f4c8d520e43bd4eff4c01 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 8 May 2015 17:53:19 -0300 Subject: Process: Use BitField to store process flags --- src/core/hle/kernel/process.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'src/core/hle/kernel/process.h') 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 @@ #include +#include "common/bit_field.h" +#include "common/common_types.h" + #include "core/hle/kernel/kernel.h" #include "core/hle/result.h" @@ -21,12 +24,27 @@ struct StaticAddressMapping { bool unk_flag; }; -enum class MemoryRegion { +enum class MemoryRegion : u16 { APPLICATION = 1, SYSTEM = 2, BASE = 3, }; +union ProcessFlags { + u16 raw; + + BitField< 0, 1, u16> allow_debug; ///< Allows other processes to attach to and debug this process. + BitField< 1, 1, u16> force_debug; ///< Allows this process to attach to processes even if they don't have allow_debug set. + BitField< 2, 1, u16> allow_nonalphanum; + BitField< 3, 1, u16> shared_page_writable; ///< Shared page is mapped with write permissions. + BitField< 4, 1, u16> privileged_priority; ///< Can use priority levels higher than 24. + BitField< 5, 1, u16> allow_main_args; + BitField< 6, 1, u16> shared_device_mem; + BitField< 7, 1, u16> runnable_on_sleep; + BitField< 8, 4, MemoryRegion> memory_region; ///< Default region for memory allocations for this process + BitField<12, 1, u16> loaded_high; ///< Application loaded high (not at 0x00100000). +}; + class Process final : public Object { public: static SharedPtr Create(std::string name, u64 program_id); @@ -43,11 +61,7 @@ public: std::bitset<0x80> svc_access_mask; unsigned int handle_table_size = 0x200; boost::container::static_vector static_address_mappings; // TODO: Determine a good upper limit - - bool loaded_high = false; // Application loaded high (not at 0x00100000) - bool shared_page_writable = false; - bool privileged_priority = false; // Can use priority levels higher than 24 - MemoryRegion memory_region = MemoryRegion::APPLICATION; + ProcessFlags flags; void ParseKernelCaps(const u32* kernel_caps, size_t len); void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size); -- cgit v1.2.3 From 83ccf85bb2dcd369e105caf35f830d58a1b608bf Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 8 May 2015 18:11:06 -0300 Subject: Process: Add more documentation to the class members --- src/core/hle/kernel/process.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/process.h') diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 16151bb22..260db8a63 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -55,15 +55,29 @@ public: static const HandleType HANDLE_TYPE = HandleType::Process; HandleType GetHandleType() const override { return HANDLE_TYPE; } - std::string name; ///< Name of the process + /// Name of the process + std::string name; + /// Title ID corresponding to the process u64 program_id; + /// The process may only call SVCs which have the corresponding bit set. std::bitset<0x80> svc_access_mask; + /// Maximum size of the handle table for the process. unsigned int handle_table_size = 0x200; - boost::container::static_vector static_address_mappings; // TODO: Determine a good upper limit + /// Special memory ranges mapped into this processes address space. This is used to give + /// processes access to specific I/O regions and device memory. + boost::container::static_vector static_address_mappings; ProcessFlags flags; + /** + * Parses a list of kernel capability descriptors (as found in the ExHeader) and applies them + * to this process. + */ void ParseKernelCaps(const u32* kernel_caps, size_t len); + + /** + * Applies address space changes and launches the process main thread. + */ void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size); private: -- cgit v1.2.3 From 3cb19c95895ab151d64682e5cbe64e938f995f46 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 8 May 2015 18:12:25 -0300 Subject: Process: Rename StaticAddressMapping => AddressMapping --- src/core/hle/kernel/process.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/process.h') diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 260db8a63..88ed9a5a5 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -16,7 +16,7 @@ namespace Kernel { -struct StaticAddressMapping { +struct AddressMapping { // Address and size must be page-aligned VAddr address; u32 size; @@ -66,7 +66,7 @@ public: unsigned int handle_table_size = 0x200; /// Special memory ranges mapped into this processes address space. This is used to give /// processes access to specific I/O regions and device memory. - boost::container::static_vector static_address_mappings; + boost::container::static_vector address_mappings; ProcessFlags flags; /** -- cgit v1.2.3