diff options
| author | bunnei <bunneidev@gmail.com> | 2021-01-20 18:10:07 -0800 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2021-01-28 21:42:26 -0800 |
| commit | 0a1449e04b99b2fe49b047f50174a60c2abb568c (patch) | |
| tree | 8fc18904c5b4349bad23152ae0f7424ceb63ca5a /src/core | |
| parent | 89a5ae92bdeb451943665868f59e364259368f11 (diff) | |
kernel: Fix build errors.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/k_thread.cpp | 9 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index f021b05505..62ce2fbd56 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -1015,8 +1015,13 @@ ResultVal<std::shared_ptr<KThread>> KThread::Create(Core::System& system, Thread std::shared_ptr<KThread> thread = std::make_shared<KThread>(kernel); - thread->InitializeThread(thread.get(), entry_point, arg, stack_top, priority, processor_id, - owner_process, type_flags); + if (const auto result = + thread->InitializeThread(thread.get(), entry_point, arg, stack_top, priority, + processor_id, owner_process, type_flags); + result.IsError()) { + return result; + } + thread->name = name; auto& scheduler = kernel.GlobalSchedulerContext(); diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index d61659453e..6142496b61 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -117,14 +117,14 @@ struct KernelCore::Impl { void InitializePhysicalCores() { exclusive_monitor = Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); - for (s32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { + for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { schedulers[i] = std::make_unique<Kernel::KScheduler>(system, i); cores.emplace_back(i, system, *schedulers[i], interrupts); } } void InitializeSchedulers() { - for (s32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { + for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { cores[i].Scheduler().Initialize(); } } |