kernel/thread: Move process thread initialization into process.cpp
This function isn't a general purpose function that should be exposed to everything, given it's specific to initializing the main thread for a Process instance. Given that, it's a tad bit more sensible to place this within process.cpp, which keeps it visible only to the code that actually needs it.
This commit is contained in:
parent
e84e4fd3f8
commit
771431f625
3 changed files with 30 additions and 36 deletions
|
@ -20,6 +20,35 @@
|
||||||
#include "core/settings.h"
|
#include "core/settings.h"
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
namespace {
|
||||||
|
/**
|
||||||
|
* Sets up the primary application thread
|
||||||
|
*
|
||||||
|
* @param owner_process The parent process for the main thread
|
||||||
|
* @param kernel The kernel instance to create the main thread under.
|
||||||
|
* @param entry_point The address at which the thread should start execution
|
||||||
|
* @param priority The priority to give the main thread
|
||||||
|
*/
|
||||||
|
void SetupMainThread(Process& owner_process, KernelCore& kernel, VAddr entry_point, u32 priority) {
|
||||||
|
// Setup page table so we can write to memory
|
||||||
|
SetCurrentPageTable(&owner_process.VMManager().page_table);
|
||||||
|
|
||||||
|
// Initialize new "main" thread
|
||||||
|
const VAddr stack_top = owner_process.VMManager().GetTLSIORegionEndAddress();
|
||||||
|
auto thread_res = Thread::Create(kernel, "main", entry_point, priority, 0, THREADPROCESSORID_0,
|
||||||
|
stack_top, owner_process);
|
||||||
|
|
||||||
|
SharedPtr<Thread> thread = std::move(thread_res).Unwrap();
|
||||||
|
|
||||||
|
// Register 1 must be a handle to the main thread
|
||||||
|
const Handle guest_handle = owner_process.GetHandleTable().Create(thread).Unwrap();
|
||||||
|
thread->SetGuestHandle(guest_handle);
|
||||||
|
thread->GetContext().cpu_registers[1] = guest_handle;
|
||||||
|
|
||||||
|
// Threads by default are dormant, wake up the main thread so it runs when the scheduler fires
|
||||||
|
thread->ResumeFromWait();
|
||||||
|
}
|
||||||
|
} // Anonymous namespace
|
||||||
|
|
||||||
CodeSet::CodeSet() = default;
|
CodeSet::CodeSet() = default;
|
||||||
CodeSet::~CodeSet() = default;
|
CodeSet::~CodeSet() = default;
|
||||||
|
@ -86,7 +115,7 @@ void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) {
|
||||||
vm_manager.LogLayout();
|
vm_manager.LogLayout();
|
||||||
ChangeStatus(ProcessStatus::Running);
|
ChangeStatus(ProcessStatus::Running);
|
||||||
|
|
||||||
Kernel::SetupMainThread(kernel, entry_point, main_thread_priority, *this);
|
SetupMainThread(*this, kernel, entry_point, main_thread_priority);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Process::PrepareForTermination() {
|
void Process::PrepareForTermination() {
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/math_util.h"
|
|
||||||
#include "common/thread_queue_list.h"
|
#include "common/thread_queue_list.h"
|
||||||
#include "core/arm/arm_interface.h"
|
#include "core/arm/arm_interface.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
|
@ -232,29 +231,6 @@ void Thread::BoostPriority(u32 priority) {
|
||||||
current_priority = priority;
|
current_priority = priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
SharedPtr<Thread> SetupMainThread(KernelCore& kernel, VAddr entry_point, u32 priority,
|
|
||||||
Process& owner_process) {
|
|
||||||
// Setup page table so we can write to memory
|
|
||||||
SetCurrentPageTable(&owner_process.VMManager().page_table);
|
|
||||||
|
|
||||||
// Initialize new "main" thread
|
|
||||||
const VAddr stack_top = owner_process.VMManager().GetTLSIORegionEndAddress();
|
|
||||||
auto thread_res = Thread::Create(kernel, "main", entry_point, priority, 0, THREADPROCESSORID_0,
|
|
||||||
stack_top, owner_process);
|
|
||||||
|
|
||||||
SharedPtr<Thread> thread = std::move(thread_res).Unwrap();
|
|
||||||
|
|
||||||
// Register 1 must be a handle to the main thread
|
|
||||||
const Handle guest_handle = owner_process.GetHandleTable().Create(thread).Unwrap();
|
|
||||||
thread->SetGuestHandle(guest_handle);
|
|
||||||
thread->GetContext().cpu_registers[1] = guest_handle;
|
|
||||||
|
|
||||||
// Threads by default are dormant, wake up the main thread so it runs when the scheduler fires
|
|
||||||
thread->ResumeFromWait();
|
|
||||||
|
|
||||||
return thread;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Thread::SetWaitSynchronizationResult(ResultCode result) {
|
void Thread::SetWaitSynchronizationResult(ResultCode result) {
|
||||||
context.cpu_registers[0] = result.raw;
|
context.cpu_registers[0] = result.raw;
|
||||||
}
|
}
|
||||||
|
|
|
@ -455,17 +455,6 @@ private:
|
||||||
ThreadActivity activity = ThreadActivity::Normal;
|
ThreadActivity activity = ThreadActivity::Normal;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets up the primary application thread
|
|
||||||
* @param kernel The kernel instance to create the main thread under.
|
|
||||||
* @param entry_point The address at which the thread should start execution
|
|
||||||
* @param priority The priority to give the main thread
|
|
||||||
* @param owner_process The parent process for the main thread
|
|
||||||
* @return A shared pointer to the main thread
|
|
||||||
*/
|
|
||||||
SharedPtr<Thread> SetupMainThread(KernelCore& kernel, VAddr entry_point, u32 priority,
|
|
||||||
Process& owner_process);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the current thread
|
* Gets the current thread
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue