diff options
| author | 2020-05-08 18:53:13 -0400 | |
|---|---|---|
| committer | 2020-06-27 11:36:14 -0400 | |
| commit | 467d43570e10b98fa33067352d35fe62ceb3cb9e (patch) | |
| tree | 830b0a3b6bc7675ce3c988c86d000f1a4287214c /src/core/hle/kernel | |
| parent | ARMInterface/Externals: Update dynarmic and fit to latest version. (diff) | |
| download | yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.gz yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.xz yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.zip | |
Clang Format.
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 11 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.h | 3 | ||||
| -rw-r--r-- | src/core/hle/kernel/physical_core.h | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_session.cpp | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 32dc1ffae..8f6c944d1 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include "common/assert.h" | 9 | #include "common/assert.h" |
| 10 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 11 | #include "core/core.h" | 11 | #include "core/core.h" |
| 12 | #include "core/core.h" | ||
| 13 | #include "core/hle/kernel/errors.h" | 12 | #include "core/hle/kernel/errors.h" |
| 14 | #include "core/hle/kernel/handle_table.h" | 13 | #include "core/hle/kernel/handle_table.h" |
| 15 | #include "core/hle/kernel/kernel.h" | 14 | #include "core/hle/kernel/kernel.h" |
| @@ -126,11 +125,11 @@ ResultCode Mutex::TryAcquire(VAddr address, Handle holding_thread_handle, | |||
| 126 | 125 | ||
| 127 | std::pair<ResultCode, std::shared_ptr<Thread>> Mutex::Unlock(std::shared_ptr<Thread> owner, | 126 | std::pair<ResultCode, std::shared_ptr<Thread>> Mutex::Unlock(std::shared_ptr<Thread> owner, |
| 128 | VAddr address) { | 127 | VAddr address) { |
| 129 | // The mutex address must be 4-byte aligned | 128 | // The mutex address must be 4-byte aligned |
| 130 | if ((address % sizeof(u32)) != 0) { | 129 | if ((address % sizeof(u32)) != 0) { |
| 131 | LOG_ERROR(Kernel, "Address is not 4-byte aligned! address={:016X}", address); | 130 | LOG_ERROR(Kernel, "Address is not 4-byte aligned! address={:016X}", address); |
| 132 | return {ERR_INVALID_ADDRESS, nullptr}; | 131 | return {ERR_INVALID_ADDRESS, nullptr}; |
| 133 | } | 132 | } |
| 134 | 133 | ||
| 135 | auto [new_owner, num_waiters] = GetHighestPriorityMutexWaitingThread(owner, address); | 134 | auto [new_owner, num_waiters] = GetHighestPriorityMutexWaitingThread(owner, address); |
| 136 | if (new_owner == nullptr) { | 135 | if (new_owner == nullptr) { |
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index bce06ecea..3b81dc3df 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h | |||
| @@ -29,7 +29,8 @@ public: | |||
| 29 | Handle requesting_thread_handle); | 29 | Handle requesting_thread_handle); |
| 30 | 30 | ||
| 31 | /// Unlocks a mutex for owner at address | 31 | /// Unlocks a mutex for owner at address |
| 32 | std::pair<ResultCode, std::shared_ptr<Thread>> Unlock(std::shared_ptr<Thread> owner, VAddr address); | 32 | std::pair<ResultCode, std::shared_ptr<Thread>> Unlock(std::shared_ptr<Thread> owner, |
| 33 | VAddr address); | ||
| 33 | 34 | ||
| 34 | /// Releases the mutex at the specified address. | 35 | /// Releases the mutex at the specified address. |
| 35 | ResultCode Release(VAddr address); | 36 | ResultCode Release(VAddr address); |
diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h index 751b994a7..85f6dec05 100644 --- a/src/core/hle/kernel/physical_core.h +++ b/src/core/hle/kernel/physical_core.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include "core/arm/cpu_interrupt_handler.h" | 10 | #include "core/arm/cpu_interrupt_handler.h" |
| 11 | 11 | ||
| 12 | namespace Common { | 12 | namespace Common { |
| 13 | class SpinLock; | 13 | class SpinLock; |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | namespace Kernel { | 16 | namespace Kernel { |
| @@ -27,9 +27,8 @@ namespace Kernel { | |||
| 27 | 27 | ||
| 28 | class PhysicalCore { | 28 | class PhysicalCore { |
| 29 | public: | 29 | public: |
| 30 | PhysicalCore(Core::System& system, std::size_t id, | 30 | PhysicalCore(Core::System& system, std::size_t id, Kernel::Scheduler& scheduler, |
| 31 | Kernel::Scheduler& scheduler, | 31 | Core::CPUInterruptHandler& interrupt_handler); |
| 32 | Core::CPUInterruptHandler& interrupt_handler); | ||
| 33 | ~PhysicalCore(); | 32 | ~PhysicalCore(); |
| 34 | 33 | ||
| 35 | PhysicalCore(const PhysicalCore&) = delete; | 34 | PhysicalCore(const PhysicalCore&) = delete; |
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index e988a3f22..7b23a6889 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp | |||
| @@ -17,9 +17,9 @@ | |||
| 17 | #include "core/hle/kernel/hle_ipc.h" | 17 | #include "core/hle/kernel/hle_ipc.h" |
| 18 | #include "core/hle/kernel/kernel.h" | 18 | #include "core/hle/kernel/kernel.h" |
| 19 | #include "core/hle/kernel/process.h" | 19 | #include "core/hle/kernel/process.h" |
| 20 | #include "core/hle/kernel/scheduler.h" | ||
| 20 | #include "core/hle/kernel/server_session.h" | 21 | #include "core/hle/kernel/server_session.h" |
| 21 | #include "core/hle/kernel/session.h" | 22 | #include "core/hle/kernel/session.h" |
| 22 | #include "core/hle/kernel/scheduler.h" | ||
| 23 | #include "core/hle/kernel/thread.h" | 23 | #include "core/hle/kernel/thread.h" |
| 24 | #include "core/memory.h" | 24 | #include "core/memory.h" |
| 25 | 25 | ||