diff options
| author | 2018-10-10 10:34:20 -0400 | |
|---|---|---|
| committer | 2018-10-10 10:34:20 -0400 | |
| commit | 68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32 (patch) | |
| tree | 1c5d3e1b178d7252cd3e752d8f2a99017a0ecb6d /src/core/core.cpp | |
| parent | Merge pull request #1461 from lioncash/warn (diff) | |
| parent | kernel/thread: Use a regular pointer for the owner/current process (diff) | |
| download | yuzu-68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32.tar.gz yuzu-68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32.tar.xz yuzu-68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32.zip | |
Merge pull request #1469 from lioncash/ptr
kernel/thread: Use a regular pointer for the owner/current process
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index b6acfb3e4..e2fb9e038 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -136,7 +136,8 @@ struct System::Impl { | |||
| 136 | if (virtual_filesystem == nullptr) | 136 | if (virtual_filesystem == nullptr) |
| 137 | virtual_filesystem = std::make_shared<FileSys::RealVfsFilesystem>(); | 137 | virtual_filesystem = std::make_shared<FileSys::RealVfsFilesystem>(); |
| 138 | 138 | ||
| 139 | kernel.MakeCurrentProcess(Kernel::Process::Create(kernel, "main")); | 139 | auto main_process = Kernel::Process::Create(kernel, "main"); |
| 140 | kernel.MakeCurrentProcess(main_process.get()); | ||
| 140 | 141 | ||
| 141 | cpu_barrier = std::make_shared<CpuBarrier>(); | 142 | cpu_barrier = std::make_shared<CpuBarrier>(); |
| 142 | cpu_exclusive_monitor = Cpu::MakeExclusiveMonitor(cpu_cores.size()); | 143 | cpu_exclusive_monitor = Cpu::MakeExclusiveMonitor(cpu_cores.size()); |
| @@ -361,11 +362,11 @@ const std::shared_ptr<Kernel::Scheduler>& System::Scheduler(std::size_t core_ind | |||
| 361 | return impl->cpu_cores[core_index]->Scheduler(); | 362 | return impl->cpu_cores[core_index]->Scheduler(); |
| 362 | } | 363 | } |
| 363 | 364 | ||
| 364 | Kernel::SharedPtr<Kernel::Process>& System::CurrentProcess() { | 365 | Kernel::Process* System::CurrentProcess() { |
| 365 | return impl->kernel.CurrentProcess(); | 366 | return impl->kernel.CurrentProcess(); |
| 366 | } | 367 | } |
| 367 | 368 | ||
| 368 | const Kernel::SharedPtr<Kernel::Process>& System::CurrentProcess() const { | 369 | const Kernel::Process* System::CurrentProcess() const { |
| 369 | return impl->kernel.CurrentProcess(); | 370 | return impl->kernel.CurrentProcess(); |
| 370 | } | 371 | } |
| 371 | 372 | ||