summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar Michael Scire2018-06-21 05:13:06 -0600
committerGravatar Michael Scire2018-06-21 05:13:06 -0600
commit8f8fe62a19060a7c4529c4e0870412e9cd97e841 (patch)
tree709de4b3bbe9f5e5c3370d07cba9004e7ddafac4 /src/core/hle/kernel/svc.cpp
parentKernel/Arbiters: Clear WaitAddress in SignalToAddress (diff)
downloadyuzu-8f8fe62a19060a7c4529c4e0870412e9cd97e841.tar.gz
yuzu-8f8fe62a19060a7c4529c4e0870412e9cd97e841.tar.xz
yuzu-8f8fe62a19060a7c4529c4e0870412e9cd97e841.zip
Kernel/Arbiters: Initialize arb_wait_address in thread struct.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 24dd50938..2d8fa6070 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -692,6 +692,8 @@ static ResultCode SignalProcessWideKey(VAddr condition_variable_addr, s32 target
692 692
693// Wait for an address (via Address Arbiter) 693// Wait for an address (via Address Arbiter)
694static ResultCode WaitForAddress(VAddr address, u32 type, s32 value, s64 timeout) { 694static ResultCode WaitForAddress(VAddr address, u32 type, s32 value, s64 timeout) {
695 NGLOG_WARNING(Kernel_SVC, "called, address=0x{:X}, type=0x{:X}, value=0x{:X}, timeout={}",
696 address, type, value, timeout);
695 // If the passed address is a kernel virtual address, return invalid memory state. 697 // If the passed address is a kernel virtual address, return invalid memory state.
696 if ((address + 0x8000000000LL) < 0x7FFFE00000LL) { 698 if ((address + 0x8000000000LL) < 0x7FFFE00000LL) {
697 return ERR_INVALID_ADDRESS_STATE; 699 return ERR_INVALID_ADDRESS_STATE;
@@ -715,6 +717,8 @@ static ResultCode WaitForAddress(VAddr address, u32 type, s32 value, s64 timeout
715 717
716// Signals to an address (via Address Arbiter) 718// Signals to an address (via Address Arbiter)
717static ResultCode SignalToAddress(VAddr address, u32 type, s32 value, s32 num_to_wake) { 719static ResultCode SignalToAddress(VAddr address, u32 type, s32 value, s32 num_to_wake) {
720 NGLOG_WARNING(Kernel_SVC, "called, address=0x{:X}, type=0x{:X}, value=0x{:X}, num_to_wake=0x{:X}",
721 address, type, value, num_to_wake);
718 // If the passed address is a kernel virtual address, return invalid memory state. 722 // If the passed address is a kernel virtual address, return invalid memory state.
719 if ((address + 0x8000000000LL) < 0x7FFFE00000LL) { 723 if ((address + 0x8000000000LL) < 0x7FFFE00000LL) {
720 return ERR_INVALID_ADDRESS_STATE; 724 return ERR_INVALID_ADDRESS_STATE;