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/kernel.cpp | 14 ++-------- src/core/hle/kernel/kernel.h | 10 ++----- src/core/hle/kernel/process.cpp | 35 +++++++++++++++++++++++ src/core/hle/kernel/process.h | 61 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 19 deletions(-) create mode 100644 src/core/hle/kernel/process.cpp create mode 100644 src/core/hle/kernel/process.h (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 533fe65fd..9c8d6fa36 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -10,6 +10,7 @@ #include "core/arm/arm_interface.h" #include "core/core.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/process.h" #include "core/hle/kernel/thread.h" #include "core/hle/kernel/timer.h" @@ -149,18 +150,7 @@ void Shutdown() { Kernel::ThreadingShutdown(); Kernel::TimersShutdown(); g_handle_table.Clear(); // Free all kernel objects -} - -/** - * Loads executable stored at specified address - * @entry_point Entry point in memory of loaded executable - * @return True on success, otherwise false - */ -bool LoadExec(u32 entry_point) { - // 0x30 is the typical main thread priority I've seen used so far - g_main_thread = Kernel::SetupMainThread(Kernel::DEFAULT_STACK_SIZE, entry_point, THREADPRIO_DEFAULT); - - return true; + g_current_process = nullptr; } } // namespace diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index a7bc6b71a..d0c69677a 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -15,6 +16,8 @@ #include "core/hle/hle.h" #include "core/hle/result.h" +struct ApplicationInfo; + namespace Kernel { class Thread; @@ -282,11 +285,4 @@ void Init(); /// Shutdown the kernel void Shutdown(); -/** - * Loads executable stored at specified address - * @entry_point Entry point in memory of loaded executable - * @return True on success, otherwise false - */ -bool LoadExec(u32 entry_point); - } // namespace diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp new file mode 100644 index 000000000..734d6f3ef --- /dev/null +++ b/src/core/hle/kernel/process.cpp @@ -0,0 +1,35 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/assert.h" + +#include "core/hle/kernel/process.h" +#include "core/hle/kernel/thread.h" + +namespace Kernel { + +SharedPtr Process::Create(std::string name, u64 program_id) { + SharedPtr process(new Process); + + process->svc_access_mask.set(); + process->name = std::move(name); + process->program_id = program_id; + + return process; +} + +void Process::ParseKernelCaps(const u32 * kernel_caps, size_t len) { + //UNIMPLEMENTED(); +} + +void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { + g_main_thread = Kernel::SetupMainThread(stack_size, entry_point, main_thread_priority); +} + +Kernel::Process::Process() {} +Kernel::Process::~Process() {} + +SharedPtr g_current_process; + +} 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 a5eba2f98466cd2788aab96f1ad93bcb32c5656c Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 21:40:39 -0300 Subject: Kernel: Remove g_program_id This has been obsoleted by the field in Process. --- src/core/hle/kernel/kernel.cpp | 2 -- src/core/hle/kernel/kernel.h | 6 ------ 2 files changed, 8 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 9c8d6fa36..5157ab2af 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -19,7 +19,6 @@ namespace Kernel { unsigned int Object::next_object_id; SharedPtr g_main_thread; HandleTable g_handle_table; -u64 g_program_id; void WaitObject::AddWaitingThread(SharedPtr thread) { auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread); @@ -141,7 +140,6 @@ void Init() { Kernel::TimersInit(); Object::next_object_id = 0; - g_program_id = 0; g_main_thread = nullptr; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index d0c69677a..7c106d37c 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -273,12 +273,6 @@ private: extern HandleTable g_handle_table; -/// The ID code of the currently running game -/// TODO(Subv): This variable should not be here, -/// we need a way to store information about the currently loaded application -/// for later query during runtime, maybe using the LDR service? -extern u64 g_program_id; - /// Initialize the kernel void Init(); -- 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.cpp | 73 +++++++++++++++++++++++++++++++++++++++-- src/core/hle/kernel/process.h | 3 +- 2 files changed, 72 insertions(+), 4 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 734d6f3ef..3aa4d8784 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -3,24 +3,91 @@ // Refer to the license.txt file included. #include "common/assert.h" +#include "common/common_funcs.h" +#include "common/logging/log.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/thread.h" +#include "core/mem_map.h" namespace Kernel { SharedPtr Process::Create(std::string name, u64 program_id) { SharedPtr process(new Process); - process->svc_access_mask.set(); process->name = std::move(name); process->program_id = program_id; return process; } -void Process::ParseKernelCaps(const u32 * kernel_caps, size_t len) { - //UNIMPLEMENTED(); +void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { + for (int i = 0; i < len; ++i) { + u32 descriptor = kernel_caps[i]; + u32 type = descriptor >> 20; + + if (descriptor == 0xFFFFFFFF) { + // Unused descriptor entry + continue; + } else if ((type & 0xF00) == 0xE00) { // 0x0FFF + // Allowed interrupts list + LOG_WARNING(Loader, "ExHeader allowed interrupts list ignored"); + } else if ((type & 0xF80) == 0xF00) { // 0x07FF + // Allowed syscalls mask + unsigned int index = ((descriptor >> 24) & 7) * 24; + u32 bits = descriptor & 0xFFFFFF; + + while (bits && index < svc_access_mask.size()) { + svc_access_mask.set(index, bits & 1); + ++index; bits >>= 1; + } + } else if ((type & 0xFF0) == 0xFE0) { // 0x00FF + // Handle table size + handle_table_size = descriptor & 0x3FF; + } else if ((type & 0xFF8) == 0xFF0) { // 0x007F + // Misc. flags + bool allow_debug = descriptor & BIT(0); + bool force_debug = descriptor & BIT(1); + bool allow_nonalphanum = descriptor & BIT(2); + shared_page_writable = descriptor & BIT(3); + privileged_priority = descriptor & BIT(4); + bool allow_main_args = descriptor & BIT(5); + bool shared_device_mem = descriptor & BIT(6); + bool runnable_on_sleep = descriptor & BIT(7); + loaded_high = descriptor & BIT(12); + memory_region = MemoryRegion((descriptor >> 8) & 0xF); + } else if ((type & 0xFFE) == 0xFF8) { // 0x001F + // Mapped memory range + if (i+1 >= len || ((kernel_caps[i+1] >> 20) & 0xFFE) != 0xFF8) { + LOG_WARNING(Loader, "Incomplete exheader memory range descriptor ignored."); + continue; + } + u32 end_desc = kernel_caps[i+1]; + ++i; // Skip over the second descriptor on the next iteration + + StaticAddressMapping mapping; + mapping.address = descriptor << 12; + mapping.size = (end_desc << 12) - mapping.address; + mapping.writable = descriptor & BIT(20); + mapping.unk_flag = end_desc & BIT(20); + + static_address_mappings.push_back(mapping); + } else if ((type & 0xFFF) == 0xFFE) { // 0x000F + // Mapped memory page + StaticAddressMapping mapping; + mapping.address = descriptor << 12; + mapping.size = Memory::PAGE_SIZE; + mapping.writable = true; // TODO: Not sure if correct + mapping.unk_flag = false; + } else if ((type & 0xFE0) == 0xFC0) { // 0x01FF + // Kernel version + int minor = descriptor & 0xFF; + int major = (descriptor >> 8) & 0xFF; + LOG_INFO(Loader, "ExHeader kernel version ignored: %d.%d", major, minor); + } else { + LOG_ERROR(Loader, "Unhandled kernel caps descriptor: 0x%08X", descriptor); + } + } } void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { 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.cpp | 14 ++++---------- src/core/hle/kernel/process.h | 26 ++++++++++++++++++++------ 2 files changed, 24 insertions(+), 16 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 3aa4d8784..be916e76a 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -18,6 +18,9 @@ SharedPtr Process::Create(std::string name, u64 program_id) { process->name = std::move(name); process->program_id = program_id; + process->flags.raw = 0; + process->flags.memory_region = MemoryRegion::APPLICATION; + return process; } @@ -46,16 +49,7 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { handle_table_size = descriptor & 0x3FF; } else if ((type & 0xFF8) == 0xFF0) { // 0x007F // Misc. flags - bool allow_debug = descriptor & BIT(0); - bool force_debug = descriptor & BIT(1); - bool allow_nonalphanum = descriptor & BIT(2); - shared_page_writable = descriptor & BIT(3); - privileged_priority = descriptor & BIT(4); - bool allow_main_args = descriptor & BIT(5); - bool shared_device_mem = descriptor & BIT(6); - bool runnable_on_sleep = descriptor & BIT(7); - loaded_high = descriptor & BIT(12); - memory_region = MemoryRegion((descriptor >> 8) & 0xF); + flags.raw = descriptor & 0xFFFF; } else if ((type & 0xFFE) == 0xFF8) { // 0x001F // Mapped memory range if (i+1 >= len || ((kernel_caps[i+1] >> 20) & 0xFFE) != 0xFF8) { 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') 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.cpp | 6 +++--- src/core/hle/kernel/process.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index be916e76a..9d83d03d6 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -59,16 +59,16 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { u32 end_desc = kernel_caps[i+1]; ++i; // Skip over the second descriptor on the next iteration - StaticAddressMapping mapping; + AddressMapping mapping; mapping.address = descriptor << 12; mapping.size = (end_desc << 12) - mapping.address; mapping.writable = descriptor & BIT(20); mapping.unk_flag = end_desc & BIT(20); - static_address_mappings.push_back(mapping); + address_mappings.push_back(mapping); } else if ((type & 0xFFF) == 0xFFE) { // 0x000F // Mapped memory page - StaticAddressMapping mapping; + AddressMapping mapping; mapping.address = descriptor << 12; mapping.size = Memory::PAGE_SIZE; mapping.writable = true; // TODO: Not sure if correct 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 From 7c50b999fa266ad1b3db422e4281f38648c362c9 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 8 May 2015 22:07:32 -0300 Subject: Kernel: Remove unused g_main_thread variable --- src/core/hle/kernel/kernel.cpp | 2 -- src/core/hle/kernel/process.cpp | 2 +- src/core/hle/kernel/thread.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 5157ab2af..a3715e555 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -17,7 +17,6 @@ namespace Kernel { unsigned int Object::next_object_id; -SharedPtr g_main_thread; HandleTable g_handle_table; void WaitObject::AddWaitingThread(SharedPtr thread) { @@ -140,7 +139,6 @@ void Init() { Kernel::TimersInit(); Object::next_object_id = 0; - g_main_thread = nullptr; } /// Shutdown the kernel diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 9d83d03d6..a444e22e5 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -85,7 +85,7 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { } void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { - g_main_thread = Kernel::SetupMainThread(stack_size, entry_point, main_thread_priority); + Kernel::SetupMainThread(stack_size, entry_point, main_thread_priority); } Kernel::Process::Process() {} diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 233bcbdbd..9958b16e6 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -171,8 +171,6 @@ private: Handle callback_handle; }; -extern SharedPtr g_main_thread; - /** * Sets up the primary application thread * @param stack_size The size of the thread's stack -- cgit v1.2.3