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.cpp | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/core/hle/kernel/process.cpp (limited to 'src/core/hle/kernel/process.cpp') 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; + +} -- 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 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 3 deletions(-) (limited to 'src/core/hle/kernel/process.cpp') 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) { -- 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 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/core/hle/kernel/process.cpp') 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) { -- 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/hle/kernel/process.cpp') 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 -- 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/process.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/kernel/process.cpp') 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() {} -- cgit v1.2.3