mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 10:43:23 +02:00
IPC: Add functions to read the input move/copy objects from an IPC request.
This commit is contained in:
parent
7e3561b1cd
commit
32847d8b86
@ -233,6 +233,12 @@ public:
|
|||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
T PopRaw();
|
T PopRaw();
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
Kernel::SharedPtr<T> GetMoveObject(size_t index);
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
Kernel::SharedPtr<T> GetCopyObject(size_t index);
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Pop ///
|
/// Pop ///
|
||||||
@ -293,4 +299,14 @@ void RequestParser::Pop(First& first_value, Other&... other_values) {
|
|||||||
Pop(other_values...);
|
Pop(other_values...);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
Kernel::SharedPtr<T> RequestParser::GetMoveObject(size_t index) {
|
||||||
|
return context->GetMoveObject<T>(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
Kernel::SharedPtr<T> RequestParser::GetCopyObject(size_t index) {
|
||||||
|
return context->GetCopyObject<T>(index);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace IPC
|
} // namespace IPC
|
||||||
|
@ -53,8 +53,20 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) {
|
|||||||
if (handle_descriptor_header->send_current_pid) {
|
if (handle_descriptor_header->send_current_pid) {
|
||||||
rp.Skip(2, false);
|
rp.Skip(2, false);
|
||||||
}
|
}
|
||||||
rp.Skip(handle_descriptor_header->num_handles_to_copy, false);
|
if (incoming) {
|
||||||
rp.Skip(handle_descriptor_header->num_handles_to_move, false);
|
// Populate the object lists with the data in the IPC request.
|
||||||
|
for (u32 handle = 0; handle < handle_descriptor_header->num_handles_to_copy; ++handle) {
|
||||||
|
copy_objects.push_back(Kernel::g_handle_table.GetGeneric(rp.Pop<Handle>()));
|
||||||
|
}
|
||||||
|
for (u32 handle = 0; handle < handle_descriptor_header->num_handles_to_move; ++handle) {
|
||||||
|
move_objects.push_back(Kernel::g_handle_table.GetGeneric(rp.Pop<Handle>()));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// For responses we just ignore the handles, they're empty and will be populated when
|
||||||
|
// translating the response.
|
||||||
|
rp.Skip(handle_descriptor_header->num_handles_to_copy, false);
|
||||||
|
rp.Skip(handle_descriptor_header->num_handles_to_move, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (unsigned i = 0; i < command_header->num_buf_x_descriptors; ++i) {
|
for (unsigned i = 0; i < command_header->num_buf_x_descriptors; ++i) {
|
||||||
|
@ -147,6 +147,18 @@ public:
|
|||||||
return domain != nullptr;
|
return domain != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
SharedPtr<T> GetCopyObject(size_t index) {
|
||||||
|
ASSERT(index < copy_objects.size());
|
||||||
|
return DynamicObjectCast(copy_objects[index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
SharedPtr<T> GetMoveObject(size_t index) {
|
||||||
|
ASSERT(index < move_objects.size());
|
||||||
|
return DynamicObjectCast(move_objects[index]);
|
||||||
|
}
|
||||||
|
|
||||||
void AddMoveObject(SharedPtr<Object> object) {
|
void AddMoveObject(SharedPtr<Object> object) {
|
||||||
move_objects.emplace_back(std::move(object));
|
move_objects.emplace_back(std::move(object));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user