summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2017-10-04 18:40:40 +0200
committerSubv <subv2112@gmail.com>2017-10-04 19:30:32 +0200
commitb863d6c86043226c8c88749c4e0eecaf9865c569 (patch)
treeb73ef73e6a2f7f7cb7fc0cb9c33ff1f7a5b00291 /src/core/hle
parentMemory: Remove all GetPointer usages from the GDB stub. (diff)
downloadyuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.tar
yuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.tar.gz
yuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.tar.bz2
yuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.tar.lz
yuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.tar.xz
yuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.tar.zst
yuzu-b863d6c86043226c8c88749c4e0eecaf9865c569.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/function_wrappers.h8
-rw-r--r--src/core/hle/svc.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index 5e6002f4e..17892d81c 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -58,12 +58,12 @@ void Wrap() {
FuncReturn(retval);
}
-template <ResultCode func(s32*, u32*, s32, bool, s64)>
+template <ResultCode func(s32*, VAddr, s32, bool, s64)>
void Wrap() {
s32 param_1 = 0;
- s32 retval = func(&param_1, (Kernel::Handle*)Memory::GetPointer(PARAM(1)), (s32)PARAM(2),
- (PARAM(3) != 0), (((s64)PARAM(4) << 32) | PARAM(0)))
- .raw;
+ s32 retval =
+ func(&param_1, PARAM(1), (s32)PARAM(2), (PARAM(3) != 0), (((s64)PARAM(4) << 32) | PARAM(0)))
+ .raw;
Core::CPU().SetReg(1, (u32)param_1);
FuncReturn(retval);
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 6be5db13f..9edce7ab7 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -303,12 +303,11 @@ static ResultCode WaitSynchronization1(Kernel::Handle handle, s64 nano_seconds)
}
/// Wait for the given handles to synchronize, timeout after the specified nanoseconds
-static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 handle_count,
+static ResultCode WaitSynchronizationN(s32* out, VAddr handles_address, s32 handle_count,
bool wait_all, s64 nano_seconds) {
Kernel::Thread* thread = Kernel::GetCurrentThread();
- // Check if 'handles' is invalid
- if (handles == nullptr)
+ if (!Memory::IsValidVirtualAddress(handles_address))
return Kernel::ERR_INVALID_POINTER;
// NOTE: on real hardware, there is no nullptr check for 'out' (tested with firmware 4.4). If
@@ -323,7 +322,8 @@ static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 ha
std::vector<ObjectPtr> objects(handle_count);
for (int i = 0; i < handle_count; ++i) {
- auto object = Kernel::g_handle_table.Get<Kernel::WaitObject>(handles[i]);
+ Kernel::Handle handle = Memory::Read32(handles_address + i * sizeof(Kernel::Handle));
+ auto object = Kernel::g_handle_table.Get<Kernel::WaitObject>(handle);
if (object == nullptr)
return ERR_INVALID_HANDLE;
objects[i] = object;