diff options
| author | 2018-01-16 18:05:21 +0000 | |
|---|---|---|
| committer | 2018-01-16 18:05:21 +0000 | |
| commit | e35644c00533c797888a23420aae90b07e0da184 (patch) | |
| tree | 4b5464207a2bf8355cd7b2b732fc3c30d3524d24 /src/core/hle/kernel | |
| parent | travis: Use more recent cmake on macOS (diff) | |
| download | yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.gz yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.xz yuzu-e35644c00533c797888a23420aae90b07e0da184.zip | |
clang-format
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 10 | ||||
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 5 |
6 files changed, 14 insertions, 18 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 09caa43df..164c6db69 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h | |||
| @@ -151,13 +151,13 @@ public: | |||
| 151 | return domain != nullptr; | 151 | return domain != nullptr; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | template<typename T> | 154 | template <typename T> |
| 155 | SharedPtr<T> GetCopyObject(size_t index) { | 155 | SharedPtr<T> GetCopyObject(size_t index) { |
| 156 | ASSERT(index < copy_objects.size()); | 156 | ASSERT(index < copy_objects.size()); |
| 157 | return DynamicObjectCast<T>(copy_objects[index]); | 157 | return DynamicObjectCast<T>(copy_objects[index]); |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | template<typename T> | 160 | template <typename T> |
| 161 | SharedPtr<T> GetMoveObject(size_t index) { | 161 | SharedPtr<T> GetMoveObject(size_t index) { |
| 162 | ASSERT(index < move_objects.size()); | 162 | ASSERT(index < move_objects.size()); |
| 163 | return DynamicObjectCast<T>(move_objects[index]); | 163 | return DynamicObjectCast<T>(move_objects[index]); |
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index df3b4083e..4d9549e45 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -105,7 +105,6 @@ public: | |||
| 105 | UNREACHABLE(); | 105 | UNREACHABLE(); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | |||
| 109 | public: | 108 | public: |
| 110 | static unsigned int next_object_id; | 109 | static unsigned int next_object_id; |
| 111 | 110 | ||
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index d990d0569..d2600cdd7 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp | |||
| @@ -95,10 +95,8 @@ MemoryRegionInfo* GetMemoryRegion(MemoryRegion region) { | |||
| 95 | } | 95 | } |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | void HandleSpecialMapping(VMManager& address_space, const AddressMapping& mapping) { | 98 | void HandleSpecialMapping(VMManager& address_space, const AddressMapping& mapping) {} |
| 99 | } | ||
| 100 | 99 | ||
| 101 | void MapSharedPages(VMManager& address_space) { | 100 | void MapSharedPages(VMManager& address_space) {} |
| 102 | } | ||
| 103 | 101 | ||
| 104 | } // namespace Kernel | 102 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 49b6b454e..38db21005 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h | |||
| @@ -41,9 +41,9 @@ public: | |||
| 41 | return HANDLE_TYPE; | 41 | return HANDLE_TYPE; |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | u32 priority; ///< The priority of the mutex, used for priority inheritance. | 44 | u32 priority; ///< The priority of the mutex, used for priority inheritance. |
| 45 | std::string name; ///< Name of mutex (optional) | 45 | std::string name; ///< Name of mutex (optional) |
| 46 | VAddr guest_addr; ///< Address of the guest mutex value | 46 | VAddr guest_addr; ///< Address of the guest mutex value |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * Elevate the mutex priority to the best priority | 49 | * Elevate the mutex priority to the best priority |
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 9c60576c1..6b3fd13c9 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -255,9 +255,8 @@ static ResultCode CancelSynchronization(Handle thread_handle) { | |||
| 255 | /// Attempts to locks a mutex, creating it if it does not already exist | 255 | /// Attempts to locks a mutex, creating it if it does not already exist |
| 256 | static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr, | 256 | static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr, |
| 257 | Handle requesting_thread_handle) { | 257 | Handle requesting_thread_handle) { |
| 258 | LOG_TRACE(Kernel_SVC, | 258 | LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " |
| 259 | "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " | 259 | "requesting_current_thread_handle=0x%08X", |
| 260 | "requesting_current_thread_handle=0x%08X", | ||
| 261 | holding_thread_handle, mutex_addr, requesting_thread_handle); | 260 | holding_thread_handle, mutex_addr, requesting_thread_handle); |
| 262 | 261 | ||
| 263 | SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle); | 262 | SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle); |
| @@ -522,9 +521,8 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V | |||
| 522 | 521 | ||
| 523 | Core::System::GetInstance().PrepareReschedule(); | 522 | Core::System::GetInstance().PrepareReschedule(); |
| 524 | 523 | ||
| 525 | LOG_TRACE(Kernel_SVC, | 524 | LOG_TRACE(Kernel_SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " |
| 526 | "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " | 525 | "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", |
| 527 | "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", | ||
| 528 | entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle); | 526 | entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle); |
| 529 | 527 | ||
| 530 | return RESULT_SUCCESS; | 528 | return RESULT_SUCCESS; |
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index dca637dde..650d47925 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp | |||
| @@ -6,9 +6,9 @@ | |||
| 6 | #include "common/assert.h" | 6 | #include "common/assert.h" |
| 7 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| 8 | #include "core/arm/arm_interface.h" | 8 | #include "core/arm/arm_interface.h" |
| 9 | #include "core/core.h" | ||
| 9 | #include "core/hle/kernel/errors.h" | 10 | #include "core/hle/kernel/errors.h" |
| 10 | #include "core/hle/kernel/vm_manager.h" | 11 | #include "core/hle/kernel/vm_manager.h" |
| 11 | #include "core/core.h" | ||
| 12 | #include "core/memory.h" | 12 | #include "core/memory.h" |
| 13 | #include "core/memory_setup.h" | 13 | #include "core/memory_setup.h" |
| 14 | #include "core/mmio.h" | 14 | #include "core/mmio.h" |
| @@ -86,7 +86,8 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target, | |||
| 86 | VirtualMemoryArea& final_vma = vma_handle->second; | 86 | VirtualMemoryArea& final_vma = vma_handle->second; |
| 87 | ASSERT(final_vma.size == size); | 87 | ASSERT(final_vma.size == size); |
| 88 | 88 | ||
| 89 | Core::CPU().MapBackingMemory(target, size, block->data() + offset, VMAPermission::ReadWriteExecute); | 89 | Core::CPU().MapBackingMemory(target, size, block->data() + offset, |
| 90 | VMAPermission::ReadWriteExecute); | ||
| 90 | 91 | ||
| 91 | final_vma.type = VMAType::AllocatedMemoryBlock; | 92 | final_vma.type = VMAType::AllocatedMemoryBlock; |
| 92 | final_vma.permissions = VMAPermission::ReadWrite; | 93 | final_vma.permissions = VMAPermission::ReadWrite; |