Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

hle_ipc: Remove GetPointer(..) usage with WriteToOutgoingCommandBuffer.

Browse source
This commit is contained in:
bunnei 2018-03-18 20:17:06 -04:00
parent e353b9fb3d
commit 019f1a0cf0
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/hle/kernel/hle_ipc.cpp
View file

@ -159,8 +159,11 @@ ResultCode HLERequestContext::PopulateFromIncomingCommandBuffer(u32_le* src_cmdb
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, Process& dst_process, ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(Thread& thread) {
HandleTable& dst_table) { std::array<u32, IPC::COMMAND_BUFFER_LENGTH> dst_cmdbuf;
Memory::ReadBlock(*thread.owner_process, thread.GetTLSAddress(), dst_cmdbuf.data(),
dst_cmdbuf.size() * sizeof(u32));
// The header was already built in the internal command buffer. Attempt to parse it to verify // The header was already built in the internal command buffer. Attempt to parse it to verify
// the integrity and then copy it over to the target command buffer. // the integrity and then copy it over to the target command buffer.
ParseCommandBuffer(cmd_buf.data(), false); ParseCommandBuffer(cmd_buf.data(), false);
@ -171,7 +174,7 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, P
if (domain_message_header) if (domain_message_header)
size -= sizeof(IPC::DomainMessageHeader) / sizeof(u32); size -= sizeof(IPC::DomainMessageHeader) / sizeof(u32);
std::copy_n(cmd_buf.begin(), size, dst_cmdbuf); std::copy_n(cmd_buf.begin(), size, dst_cmdbuf.data());
if (command_header->enable_handle_descriptor) { if (command_header->enable_handle_descriptor) {
ASSERT_MSG(!move_objects.empty() || !copy_objects.empty(), ASSERT_MSG(!move_objects.empty() || !copy_objects.empty(),
@ -213,6 +216,11 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, P
dst_cmdbuf[domain_offset++] = static_cast<u32_le>(request_handlers.size()); dst_cmdbuf[domain_offset++] = static_cast<u32_le>(request_handlers.size());
} }
} }
// Copy the translated command buffer back into the thread's command buffer area.
Memory::WriteBlock(*thread.owner_process, thread.GetTLSAddress(), dst_cmdbuf.data(),
dst_cmdbuf.size() * sizeof(u32));
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

4
src/core/hle/kernel/hle_ipc.h
View file

@ -13,6 +13,7 @@
#include "core/hle/ipc.h" #include "core/hle/ipc.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/server_session.h" #include "core/hle/kernel/server_session.h"
#include "core/hle/kernel/thread.h"
namespace Service { namespace Service {
class ServiceFrameworkBase; class ServiceFrameworkBase;
@ -108,8 +109,7 @@ public:
ResultCode PopulateFromIncomingCommandBuffer(u32_le* src_cmdbuf, Process& src_process, ResultCode PopulateFromIncomingCommandBuffer(u32_le* src_cmdbuf, Process& src_process,
HandleTable& src_table); HandleTable& src_table);
/// Writes data from this context back to the requesting process/thread. /// Writes data from this context back to the requesting process/thread.
ResultCode WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, Process& dst_process, ResultCode WriteToOutgoingCommandBuffer(Thread& thread);
HandleTable& dst_table);
u32_le GetCommand() const { u32_le GetCommand() const {
return command; return command;

3
src/core/hle/service/service.cpp
View file

@ -152,8 +152,7 @@ ResultCode ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& co
UNIMPLEMENTED_MSG("command_type=%d", context.GetCommandType()); UNIMPLEMENTED_MSG("command_type=%d", context.GetCommandType());
} }
u32* cmd_buf = (u32*)Memory::GetPointer(Kernel::GetCurrentThread()->GetTLSAddress()); context.WriteToOutgoingCommandBuffer(*Kernel::GetCurrentThread());
context.WriteToOutgoingCommandBuffer(cmd_buf, *Core::CurrentProcess(), Kernel::g_handle_table);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }