Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 05:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

SVC: Replace GetPointer usage with Read32 in ReplyAndReceive.

Browse source
This commit is contained in:
Subv 2017-10-04 11:49:29 -05:00
parent b863d6c860
commit 0cfb231e00
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/hle/function_wrappers.h
View file

@ -69,11 +69,10 @@ void Wrap() {
FuncReturn(retval); FuncReturn(retval);
} }
template <ResultCode func(s32*, u32*, s32, u32)> template <ResultCode func(s32*, VAddr, s32, u32)>
void Wrap() { void Wrap() {
s32 param_1 = 0; s32 param_1 = 0;
u32 retval = u32 retval = func(&param_1, PARAM(1), (s32)PARAM(2), PARAM(3)).raw;
func(&param_1, (Kernel::Handle*)Memory::GetPointer(PARAM(1)), (s32)PARAM(2), PARAM(3)).raw;
Core::CPU().SetReg(1, (u32)param_1); Core::CPU().SetReg(1, (u32)param_1);
FuncReturn(retval); FuncReturn(retval);

8
src/core/hle/svc.cpp
View file

@ -452,10 +452,9 @@ static ResultCode WaitSynchronizationN(s32* out, VAddr handles_address, s32 hand
} }
/// In a single operation, sends a IPC reply and waits for a new request. /// In a single operation, sends a IPC reply and waits for a new request.
static ResultCode ReplyAndReceive(s32* index, Kernel::Handle* handles, s32 handle_count, static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_count,
Kernel::Handle reply_target) { Kernel::Handle reply_target) {
// 'handles' has to be a valid pointer even if 'handle_count' is 0. if (!Memory::IsValidVirtualAddress(handles_address))
if (handles == nullptr)
return Kernel::ERR_INVALID_POINTER; return Kernel::ERR_INVALID_POINTER;
// Check if 'handle_count' is invalid // Check if 'handle_count' is invalid
@ -466,7 +465,8 @@ static ResultCode ReplyAndReceive(s32* index, Kernel::Handle* handles, s32 handl
std::vector<ObjectPtr> objects(handle_count); std::vector<ObjectPtr> objects(handle_count);
for (int i = 0; i < handle_count; ++i) { 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) if (object == nullptr)
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
objects[i] = object; objects[i] = object;