mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-15 22:54:00 +00:00
hle_ipc: Parse out buffer X/A/B/B descriptors from incoming command buffer.
This commit is contained in:
parent
03bf0739a4
commit
b283cf7348
2 changed files with 19 additions and 14 deletions
|
@ -66,28 +66,25 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) {
|
||||||
rp.Skip(handle_descriptor_header->num_handles_to_move, false);
|
rp.Skip(handle_descriptor_header->num_handles_to_move, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Padding to align to 16 bytes
|
for (int i = 0; i < command_header->num_buf_x_descriptors; ++i) {
|
||||||
rp.AlignWithPadding();
|
buffer_x_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorX>());
|
||||||
|
|
||||||
if (command_header->num_buf_x_descriptors) {
|
|
||||||
UNIMPLEMENTED();
|
|
||||||
}
|
}
|
||||||
if (command_header->num_buf_a_descriptors) {
|
for (int i = 0; i < command_header->num_buf_a_descriptors; ++i) {
|
||||||
UNIMPLEMENTED();
|
buffer_a_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorABW>());
|
||||||
}
|
}
|
||||||
if (command_header->num_buf_b_descriptors) {
|
for (int i = 0; i < command_header->num_buf_b_descriptors; ++i) {
|
||||||
UNIMPLEMENTED();
|
buffer_b_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorABW>());
|
||||||
}
|
}
|
||||||
if (command_header->num_buf_w_descriptors) {
|
for (int i = 0; i < command_header->num_buf_w_descriptors; ++i) {
|
||||||
UNIMPLEMENTED();
|
buffer_w_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorABW>());
|
||||||
}
|
}
|
||||||
if (command_header->buf_c_descriptor_flags !=
|
if (command_header->buf_c_descriptor_flags !=
|
||||||
IPC::CommandHeader::BufferDescriptorCFlag::Disabled) {
|
IPC::CommandHeader::BufferDescriptorCFlag::Disabled) {
|
||||||
UNIMPLEMENTED();
|
UNIMPLEMENTED();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (incoming && Session()->IsDomain()) {
|
// Padding to align to 16 bytes
|
||||||
domain_message_header = std::make_unique<IPC::DomainMessageHeader>(rp.PopRaw<IPC::DomainMessageHeader>());
|
rp.AlignWithPadding();
|
||||||
}
|
}
|
||||||
|
|
||||||
data_payload_header =
|
data_payload_header =
|
||||||
|
@ -123,7 +120,7 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, P
|
||||||
HandleTable& dst_table) {
|
HandleTable& dst_table) {
|
||||||
ParseCommandBuffer(&cmd_buf[0], false);
|
ParseCommandBuffer(&cmd_buf[0], false);
|
||||||
size_t untranslated_size = data_payload_offset + command_header->data_size;
|
size_t untranslated_size = data_payload_offset + command_header->data_size;
|
||||||
std::copy_n(cmd_buf.begin(), untranslated_size, dst_cmdbuf);
|
std::copy_n(cmd_buf.begin(), 64, dst_cmdbuf);
|
||||||
|
|
||||||
if (command_header->enable_handle_descriptor) {
|
if (command_header->enable_handle_descriptor) {
|
||||||
size_t command_size = untranslated_size + handle_descriptor_header->num_handles_to_copy +
|
size_t command_size = untranslated_size + handle_descriptor_header->num_handles_to_copy +
|
||||||
|
|
|
@ -140,6 +140,10 @@ public:
|
||||||
return data_payload_offset;
|
return data_payload_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const std::vector<IPC::BufferDescriptorX>& BufferDescriptorX() const {
|
||||||
|
return buffer_x_desciptors;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::array<u32, IPC::COMMAND_BUFFER_LENGTH> cmd_buf;
|
std::array<u32, IPC::COMMAND_BUFFER_LENGTH> cmd_buf;
|
||||||
SharedPtr<ServerSession> session;
|
SharedPtr<ServerSession> session;
|
||||||
|
@ -150,6 +154,10 @@ private:
|
||||||
std::unique_ptr<IPC::HandleDescriptorHeader> handle_descriptor_header;
|
std::unique_ptr<IPC::HandleDescriptorHeader> handle_descriptor_header;
|
||||||
std::unique_ptr<IPC::DataPayloadHeader> data_payload_header;
|
std::unique_ptr<IPC::DataPayloadHeader> data_payload_header;
|
||||||
std::unique_ptr<IPC::DomainMessageHeader> domain_message_header;
|
std::unique_ptr<IPC::DomainMessageHeader> domain_message_header;
|
||||||
|
std::vector<IPC::BufferDescriptorX> buffer_x_desciptors;
|
||||||
|
std::vector<IPC::BufferDescriptorABW> buffer_a_desciptors;
|
||||||
|
std::vector<IPC::BufferDescriptorABW> buffer_b_desciptors;
|
||||||
|
std::vector<IPC::BufferDescriptorABW> buffer_w_desciptors;
|
||||||
|
|
||||||
unsigned data_payload_offset{};
|
unsigned data_payload_offset{};
|
||||||
u32_le command{};
|
u32_le command{};
|
||||||
|
|
Loading…
Reference in a new issue