hle: ipc_helpers: Update IPC response generation for TIPC.

This commit is contained in:
bunnei 2021-05-08 02:21:50 -07:00
parent ec50a9b5b9
commit d08bd3e062
2 changed files with 39 additions and 19 deletions

View file

@ -26,7 +26,7 @@ class RequestHelperBase {
protected: protected:
Kernel::HLERequestContext* context = nullptr; Kernel::HLERequestContext* context = nullptr;
u32* cmdbuf; u32* cmdbuf;
ptrdiff_t index = 0; u32 index = 0;
public: public:
explicit RequestHelperBase(u32* command_buffer) : cmdbuf(command_buffer) {} explicit RequestHelperBase(u32* command_buffer) : cmdbuf(command_buffer) {}
@ -38,7 +38,7 @@ public:
if (set_to_null) { if (set_to_null) {
memset(cmdbuf + index, 0, size_in_words * sizeof(u32)); memset(cmdbuf + index, 0, size_in_words * sizeof(u32));
} }
index += static_cast<ptrdiff_t>(size_in_words); index += size_in_words;
} }
/** /**
@ -51,11 +51,11 @@ public:
} }
u32 GetCurrentOffset() const { u32 GetCurrentOffset() const {
return static_cast<u32>(index); return index;
} }
void SetCurrentOffset(u32 offset) { void SetCurrentOffset(u32 offset) {
index = static_cast<ptrdiff_t>(offset); index = offset;
} }
}; };
@ -84,7 +84,9 @@ public:
// The entire size of the raw data section in u32 units, including the 16 bytes of mandatory // The entire size of the raw data section in u32 units, including the 16 bytes of mandatory
// padding. // padding.
u64 raw_data_size = sizeof(IPC::DataPayloadHeader) / 4 + 4 + normal_params_size; u32 raw_data_size = ctx.IsTipc()
? normal_params_size - 1
: sizeof(IPC::DataPayloadHeader) / 4 + 4 + normal_params_size;
u32 num_handles_to_move{}; u32 num_handles_to_move{};
u32 num_domain_objects{}; u32 num_domain_objects{};
@ -100,6 +102,10 @@ public:
raw_data_size += sizeof(DomainMessageHeader) / 4 + num_domain_objects; raw_data_size += sizeof(DomainMessageHeader) / 4 + num_domain_objects;
} }
if (ctx.IsTipc()) {
header.type.Assign(ctx.GetCommandType());
}
header.data_size.Assign(static_cast<u32>(raw_data_size)); header.data_size.Assign(static_cast<u32>(raw_data_size));
if (num_handles_to_copy || num_handles_to_move) { if (num_handles_to_copy || num_handles_to_move) {
header.enable_handle_descriptor.Assign(1); header.enable_handle_descriptor.Assign(1);
@ -111,22 +117,30 @@ public:
handle_descriptor_header.num_handles_to_copy.Assign(num_handles_to_copy); handle_descriptor_header.num_handles_to_copy.Assign(num_handles_to_copy);
handle_descriptor_header.num_handles_to_move.Assign(num_handles_to_move); handle_descriptor_header.num_handles_to_move.Assign(num_handles_to_move);
PushRaw(handle_descriptor_header); PushRaw(handle_descriptor_header);
ctx.handles_offset = index;
Skip(num_handles_to_copy + num_handles_to_move, true); Skip(num_handles_to_copy + num_handles_to_move, true);
} }
AlignWithPadding(); if (!ctx.IsTipc()) {
AlignWithPadding();
if (ctx.Session()->IsDomain() && ctx.HasDomainMessageHeader()) { if (ctx.Session()->IsDomain() && ctx.HasDomainMessageHeader()) {
IPC::DomainMessageHeader domain_header{}; IPC::DomainMessageHeader domain_header{};
domain_header.num_objects = num_domain_objects; domain_header.num_objects = num_domain_objects;
PushRaw(domain_header); PushRaw(domain_header);
}
IPC::DataPayloadHeader data_payload_header{};
data_payload_header.magic = Common::MakeMagic('S', 'F', 'C', 'O');
PushRaw(data_payload_header);
} }
IPC::DataPayloadHeader data_payload_header{}; data_payload_index = index;
data_payload_header.magic = Common::MakeMagic('S', 'F', 'C', 'O');
PushRaw(data_payload_header);
datapayload_index = index; ctx.data_payload_offset = index;
ctx.domain_offset = index + raw_data_size / 4;
} }
template <class T> template <class T>
@ -152,7 +166,7 @@ public:
const std::size_t num_move_objects = context->NumMoveObjects(); const std::size_t num_move_objects = context->NumMoveObjects();
ASSERT_MSG(!num_domain_objects || !num_move_objects, ASSERT_MSG(!num_domain_objects || !num_move_objects,
"cannot move normal handles and domain objects"); "cannot move normal handles and domain objects");
ASSERT_MSG((index - datapayload_index) == normal_params_size, ASSERT_MSG((index - data_payload_index) == normal_params_size,
"normal_params_size value is incorrect"); "normal_params_size value is incorrect");
ASSERT_MSG((num_domain_objects + num_move_objects) == num_objects_to_move, ASSERT_MSG((num_domain_objects + num_move_objects) == num_objects_to_move,
"num_objects_to_move value is incorrect"); "num_objects_to_move value is incorrect");
@ -229,14 +243,14 @@ private:
u32 normal_params_size{}; u32 normal_params_size{};
u32 num_handles_to_copy{}; u32 num_handles_to_copy{};
u32 num_objects_to_move{}; ///< Domain objects or move handles, context dependent u32 num_objects_to_move{}; ///< Domain objects or move handles, context dependent
std::ptrdiff_t datapayload_index{}; u32 data_payload_index{};
Kernel::KernelCore& kernel; Kernel::KernelCore& kernel;
}; };
/// Push /// /// Push ///
inline void ResponseBuilder::PushImpl(s32 value) { inline void ResponseBuilder::PushImpl(s32 value) {
cmdbuf[index++] = static_cast<u32>(value); cmdbuf[index++] = value;
} }
inline void ResponseBuilder::PushImpl(u32 value) { inline void ResponseBuilder::PushImpl(u32 value) {

View file

@ -132,6 +132,10 @@ public:
return command; return command;
} }
bool IsTipc() const {
return command_header->IsTipc();
}
IPC::CommandType GetCommandType() const { IPC::CommandType GetCommandType() const {
return command_header->type; return command_header->type;
} }
@ -291,8 +295,10 @@ private:
std::vector<IPC::BufferDescriptorABW> buffer_w_desciptors; std::vector<IPC::BufferDescriptorABW> buffer_w_desciptors;
std::vector<IPC::BufferDescriptorC> buffer_c_desciptors; std::vector<IPC::BufferDescriptorC> buffer_c_desciptors;
unsigned data_payload_offset{}; u32 data_payload_offset{};
unsigned buffer_c_offset{}; u32 buffer_c_offset{};
u32 handles_offset{};
u32 domain_offset{};
u32_le command{}; u32_le command{};
std::vector<std::shared_ptr<SessionRequestHandler>> domain_request_handlers; std::vector<std::shared_ptr<SessionRequestHandler>> domain_request_handlers;