diff options
| author | 2020-03-31 15:10:44 -0400 | |
|---|---|---|
| committer | 2020-04-17 00:59:28 -0400 | |
| commit | 4caff51710a793c6c2c1069ddd6e92185aa731fe (patch) | |
| tree | 9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/hle/kernel/svc.cpp | |
| parent | common: alignment: Add a helper function for generic alignment checking. (diff) | |
| download | yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.gz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.xz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.zip | |
core: memory: Move to Core::Memory namespace.
- helpful to disambiguate Kernel::Memory namespace.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index abd579097..bde81fab5 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -539,7 +539,7 @@ static ResultCode ArbitrateLock(Core::System& system, Handle holding_thread_hand | |||
| 539 | "requesting_current_thread_handle=0x{:08X}", | 539 | "requesting_current_thread_handle=0x{:08X}", |
| 540 | holding_thread_handle, mutex_addr, requesting_thread_handle); | 540 | holding_thread_handle, mutex_addr, requesting_thread_handle); |
| 541 | 541 | ||
| 542 | if (Memory::IsKernelVirtualAddress(mutex_addr)) { | 542 | if (Core::Memory::IsKernelVirtualAddress(mutex_addr)) { |
| 543 | LOG_ERROR(Kernel_SVC, "Mutex Address is a kernel virtual address, mutex_addr={:016X}", | 543 | LOG_ERROR(Kernel_SVC, "Mutex Address is a kernel virtual address, mutex_addr={:016X}", |
| 544 | mutex_addr); | 544 | mutex_addr); |
| 545 | return ERR_INVALID_ADDRESS_STATE; | 545 | return ERR_INVALID_ADDRESS_STATE; |
| @@ -559,7 +559,7 @@ static ResultCode ArbitrateLock(Core::System& system, Handle holding_thread_hand | |||
| 559 | static ResultCode ArbitrateUnlock(Core::System& system, VAddr mutex_addr) { | 559 | static ResultCode ArbitrateUnlock(Core::System& system, VAddr mutex_addr) { |
| 560 | LOG_TRACE(Kernel_SVC, "called mutex_addr=0x{:X}", mutex_addr); | 560 | LOG_TRACE(Kernel_SVC, "called mutex_addr=0x{:X}", mutex_addr); |
| 561 | 561 | ||
| 562 | if (Memory::IsKernelVirtualAddress(mutex_addr)) { | 562 | if (Core::Memory::IsKernelVirtualAddress(mutex_addr)) { |
| 563 | LOG_ERROR(Kernel_SVC, "Mutex Address is a kernel virtual address, mutex_addr={:016X}", | 563 | LOG_ERROR(Kernel_SVC, "Mutex Address is a kernel virtual address, mutex_addr={:016X}", |
| 564 | mutex_addr); | 564 | mutex_addr); |
| 565 | return ERR_INVALID_ADDRESS_STATE; | 565 | return ERR_INVALID_ADDRESS_STATE; |
| @@ -1611,7 +1611,7 @@ static ResultCode WaitProcessWideKeyAtomic(Core::System& system, VAddr mutex_add | |||
| 1611 | "called mutex_addr={:X}, condition_variable_addr={:X}, thread_handle=0x{:08X}, timeout={}", | 1611 | "called mutex_addr={:X}, condition_variable_addr={:X}, thread_handle=0x{:08X}, timeout={}", |
| 1612 | mutex_addr, condition_variable_addr, thread_handle, nano_seconds); | 1612 | mutex_addr, condition_variable_addr, thread_handle, nano_seconds); |
| 1613 | 1613 | ||
| 1614 | if (Memory::IsKernelVirtualAddress(mutex_addr)) { | 1614 | if (Core::Memory::IsKernelVirtualAddress(mutex_addr)) { |
| 1615 | LOG_ERROR( | 1615 | LOG_ERROR( |
| 1616 | Kernel_SVC, | 1616 | Kernel_SVC, |
| 1617 | "Given mutex address must not be within the kernel address space. address=0x{:016X}", | 1617 | "Given mutex address must not be within the kernel address space. address=0x{:016X}", |
| @@ -1742,7 +1742,7 @@ static ResultCode WaitForAddress(Core::System& system, VAddr address, u32 type, | |||
| 1742 | type, value, timeout); | 1742 | type, value, timeout); |
| 1743 | 1743 | ||
| 1744 | // If the passed address is a kernel virtual address, return invalid memory state. | 1744 | // If the passed address is a kernel virtual address, return invalid memory state. |
| 1745 | if (Memory::IsKernelVirtualAddress(address)) { | 1745 | if (Core::Memory::IsKernelVirtualAddress(address)) { |
| 1746 | LOG_ERROR(Kernel_SVC, "Address is a kernel virtual address, address={:016X}", address); | 1746 | LOG_ERROR(Kernel_SVC, "Address is a kernel virtual address, address={:016X}", address); |
| 1747 | return ERR_INVALID_ADDRESS_STATE; | 1747 | return ERR_INVALID_ADDRESS_STATE; |
| 1748 | } | 1748 | } |
| @@ -1770,7 +1770,7 @@ static ResultCode SignalToAddress(Core::System& system, VAddr address, u32 type, | |||
| 1770 | address, type, value, num_to_wake); | 1770 | address, type, value, num_to_wake); |
| 1771 | 1771 | ||
| 1772 | // If the passed address is a kernel virtual address, return invalid memory state. | 1772 | // If the passed address is a kernel virtual address, return invalid memory state. |
| 1773 | if (Memory::IsKernelVirtualAddress(address)) { | 1773 | if (Core::Memory::IsKernelVirtualAddress(address)) { |
| 1774 | LOG_ERROR(Kernel_SVC, "Address is a kernel virtual address, address={:016X}", address); | 1774 | LOG_ERROR(Kernel_SVC, "Address is a kernel virtual address, address={:016X}", address); |
| 1775 | return ERR_INVALID_ADDRESS_STATE; | 1775 | return ERR_INVALID_ADDRESS_STATE; |
| 1776 | } | 1776 | } |