summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-05-02 15:55:14 +0200
committerGitHub <noreply@github.com>2018-05-02 15:55:14 +0200
commit902182f80cb808d221998ab904a0c8dab93fd440 (patch)
treed8add81daca8bc72d5344549528ce4f3953f250f
parentMerge pull request #429 from Subv/ioctl_corruption (diff)
parentipc: Add support for PopIpcInterface() method. (diff)
downloadyuzu-902182f80cb808d221998ab904a0c8dab93fd440.tar
yuzu-902182f80cb808d221998ab904a0c8dab93fd440.tar.gz
yuzu-902182f80cb808d221998ab904a0c8dab93fd440.tar.bz2
yuzu-902182f80cb808d221998ab904a0c8dab93fd440.tar.lz
yuzu-902182f80cb808d221998ab904a0c8dab93fd440.tar.xz
yuzu-902182f80cb808d221998ab904a0c8dab93fd440.tar.zst
yuzu-902182f80cb808d221998ab904a0c8dab93fd440.zip
-rw-r--r--src/core/hle/ipc.h1
-rw-r--r--src/core/hle/ipc_helpers.h7
-rw-r--r--src/core/hle/kernel/hle_ipc.h12
-rw-r--r--src/core/hle/kernel/server_session.cpp3
4 files changed, 23 insertions, 0 deletions
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h
index a6602e12c..ef6595550 100644
--- a/src/core/hle/ipc.h
+++ b/src/core/hle/ipc.h
@@ -167,6 +167,7 @@ struct DomainMessageHeader {
struct {
union {
BitField<0, 8, CommandType> command;
+ BitField<8, 8, u32_le> input_object_count;
BitField<16, 16, u32_le> size;
};
u32_le object_id;
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h
index 3f87c4297..24605a273 100644
--- a/src/core/hle/ipc_helpers.h
+++ b/src/core/hle/ipc_helpers.h
@@ -298,6 +298,13 @@ public:
template <typename T>
Kernel::SharedPtr<T> GetCopyObject(size_t index);
+
+ template <class T>
+ std::shared_ptr<T> PopIpcInterface() {
+ ASSERT(context->Session()->IsDomain());
+ ASSERT(context->GetDomainMessageHeader()->input_object_count > 0);
+ return context->GetDomainRequestHandler<T>(Pop<u32>() - 1);
+ }
};
/// Pop ///
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 6d4ed7648..376263eac 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -202,6 +202,16 @@ public:
domain_objects.emplace_back(std::move(object));
}
+ template <typename T>
+ std::shared_ptr<T> GetDomainRequestHandler(size_t index) const {
+ return std::static_pointer_cast<T>(domain_request_handlers[index]);
+ }
+
+ void SetDomainRequestHandlers(
+ const std::vector<std::shared_ptr<SessionRequestHandler>>& handlers) {
+ domain_request_handlers = handlers;
+ }
+
/// Clears the list of objects so that no lingering objects are written accidentally to the
/// response buffer.
void ClearIncomingObjects() {
@@ -245,6 +255,8 @@ private:
unsigned data_payload_offset{};
unsigned buffer_c_offset{};
u32_le command{};
+
+ std::vector<std::shared_ptr<SessionRequestHandler>> domain_request_handlers;
};
} // namespace Kernel
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp
index b1f8e771c..ed33c8600 100644
--- a/src/core/hle/kernel/server_session.cpp
+++ b/src/core/hle/kernel/server_session.cpp
@@ -61,6 +61,9 @@ void ServerSession::Acquire(Thread* thread) {
ResultCode ServerSession::HandleDomainSyncRequest(Kernel::HLERequestContext& context) {
auto& domain_message_header = context.GetDomainMessageHeader();
if (domain_message_header) {
+ // Set domain handlers in HLE context, used for domain objects (IPC interfaces) as inputs
+ context.SetDomainRequestHandlers(domain_request_handlers);
+
// If there is a DomainMessageHeader, then this is CommandType "Request"
const u32 object_id{context.GetDomainMessageHeader()->object_id};
switch (domain_message_header->command) {