diff options
| author | 2021-01-20 18:10:07 -0800 | |
|---|---|---|
| committer | 2021-01-28 21:42:26 -0800 | |
| commit | 0a1449e04b99b2fe49b047f50174a60c2abb568c (patch) | |
| tree | 8fc18904c5b4349bad23152ae0f7424ceb63ca5a /src/core | |
| parent | core: cpu_manager: Remove unused variable. (diff) | |
| download | yuzu-0a1449e04b99b2fe49b047f50174a60c2abb568c.tar.gz yuzu-0a1449e04b99b2fe49b047f50174a60c2abb568c.tar.xz yuzu-0a1449e04b99b2fe49b047f50174a60c2abb568c.zip | |
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 f021b0550..62ce2fbd5 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 | |||
| 1015 | 1015 | ||
| 1016 | std::shared_ptr<KThread> thread = std::make_shared<KThread>(kernel); | 1016 | std::shared_ptr<KThread> thread = std::make_shared<KThread>(kernel); |
| 1017 | 1017 | ||
| 1018 | thread->InitializeThread(thread.get(), entry_point, arg, stack_top, priority, processor_id, | 1018 | if (const auto result = |
| 1019 | owner_process, type_flags); | 1019 | thread->InitializeThread(thread.get(), entry_point, arg, stack_top, priority, |
| 1020 | processor_id, owner_process, type_flags); | ||
| 1021 | result.IsError()) { | ||
| 1022 | return result; | ||
| 1023 | } | ||
| 1024 | |||
| 1020 | thread->name = name; | 1025 | thread->name = name; |
| 1021 | 1026 | ||
| 1022 | auto& scheduler = kernel.GlobalSchedulerContext(); | 1027 | auto& scheduler = kernel.GlobalSchedulerContext(); |
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index d61659453..6142496b6 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -117,14 +117,14 @@ struct KernelCore::Impl { | |||
| 117 | void InitializePhysicalCores() { | 117 | void InitializePhysicalCores() { |
| 118 | exclusive_monitor = | 118 | exclusive_monitor = |
| 119 | Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); | 119 | Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); |
| 120 | for (s32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { | 120 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { |
| 121 | schedulers[i] = std::make_unique<Kernel::KScheduler>(system, i); | 121 | schedulers[i] = std::make_unique<Kernel::KScheduler>(system, i); |
| 122 | cores.emplace_back(i, system, *schedulers[i], interrupts); | 122 | cores.emplace_back(i, system, *schedulers[i], interrupts); |
| 123 | } | 123 | } |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | void InitializeSchedulers() { | 126 | void InitializeSchedulers() { |
| 127 | for (s32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { | 127 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { |
| 128 | cores[i].Scheduler().Initialize(); | 128 | cores[i].Scheduler().Initialize(); |
| 129 | } | 129 | } |
| 130 | } | 130 | } |