Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hle: Implement ConvertSessionToDomain, various cleanups.

Browse source
This commit is contained in:
bunnei 2017-10-15 01:24:22 -04:00
parent 746c2a3ae7
commit 4fb1b24d68
10 changed files with 82 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle/service/lm/lm.cpp
View file

@ -18,7 +18,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
* Inputs:
* 0: 0x00000000
* Outputs:
* 1: ResultCode
* 0: ResultCode
*/
void LM::Initialize(Kernel::HLERequestContext& ctx) {
IPC::RequestBuilder rb{ctx, 1};
@ -29,10 +29,6 @@ void LM::Initialize(Kernel::HLERequestContext& ctx) {
LM::LM() : ServiceFramework("lm") {
static const FunctionInfo functions[] = {
{0x00000000, &LM::Initialize, "Initialize"},
{0x00000001, nullptr, "Unknown2"},
{0x00000002, nullptr, "Unknown3"},
{0x00000003, nullptr, "Unknown4"},
{0x00000004, nullptr, "Unknown5"},
};
RegisterHandlers(functions);
}

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

@ -10,11 +10,11 @@
#include "core/hle/ipc.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/server_port.h"
#include "core/hle/kernel/server_session.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/handle_table.h"
#include "core/hle/service/am/am.h"
#include "core/hle/service/apm/apm.h"
#include "core/hle/service/dsp_dsp.h"
@ -82,7 +82,8 @@ void ServiceFrameworkBase::RegisterHandlersBase(const FunctionInfoBase* function
}
}
void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info) {
void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext& ctx,
const FunctionInfoBase* info) {
auto cmd_buf = ctx.CommandBuffer();
std::string function_name = info == nullptr ? fmt::format("{:#08x}", cmd_buf[0]) : info->name;
@ -96,7 +97,7 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext
LOG_ERROR(Service, "unknown / unimplemented %s", w.c_str());
// TODO(bunnei): Hack - ignore error
IPC::RequestBuilder rb{ ctx, 1 };
IPC::RequestBuilder rb{ctx, 1};
rb.Push(RESULT_SUCCESS);
}
@ -107,13 +108,14 @@ void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) {
return ReportUnimplementedFunction(ctx, info);
}
LOG_TRACE(Service, "%s",
LOG_TRACE(
Service, "%s",
MakeFunctionString(info->name, GetServiceName().c_str(), ctx.CommandBuffer()).c_str());
handler_invoker(this, info->handler_callback, ctx);
}
void ServiceFrameworkBase::HandleSyncRequest(SharedPtr<ServerSession> server_session) {
u32* cmd_buf = (u32*)Memory::GetPointer(Kernel::GetCurrentThread()->GetTLSAddress());;
u32* cmd_buf = (u32*)Memory::GetPointer(Kernel::GetCurrentThread()->GetTLSAddress());
// TODO(yuriks): The kernel should be the one handling this as part of translation after
// everything else is migrated
@ -122,19 +124,16 @@ void ServiceFrameworkBase::HandleSyncRequest(SharedPtr<ServerSession> server_ses
Kernel::g_handle_table);
switch (context.GetCommandType()) {
case IPC::CommandType::Close:
{
case IPC::CommandType::Close: {
IPC::RequestBuilder rb{context, 1};
rb.Push(RESULT_SUCCESS);
break;
}
case IPC::CommandType::Control:
{
case IPC::CommandType::Control: {
SM::g_service_manager->InvokeControlRequest(context);
break;
}
case IPC::CommandType::Request:
{
case IPC::CommandType::Request: {
InvokeRequest(context);
break;
}
@ -176,4 +175,4 @@ void Shutdown() {
g_kernel_named_ports.clear();
LOG_DEBUG(Service, "shutdown OK");
}
}
} // namespace Service

30
src/core/hle/service/sm/controller.cpp
View file

@ -9,25 +9,43 @@
namespace Service {
namespace SM {
/**
* Controller::ConvertSessionToDomain service function
* Inputs:
* 0: 0x00000000
* Outputs:
* 0: ResultCode
* 2: Handle of domain
*/
void Controller::ConvertSessionToDomain(Kernel::HLERequestContext& ctx) {
ctx.Session()->ConvertToDomain();
IPC::RequestBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
rb.Skip(1, true);
Kernel::Handle handle = Kernel::g_handle_table.Create(ctx.Session()).Unwrap();
rb.Push(handle);
LOG_DEBUG(Service, "called, handle=0x%08x", handle);
}
/**
* Controller::QueryPointerBufferSize service function
* Inputs:
* 0: 0x00000003
* Outputs:
* 1: ResultCode
* 3: Size of memory
* 0: ResultCode
* 2: Size of memory
*/
void Controller::QueryPointerBufferSize(Kernel::HLERequestContext& ctx) {
IPC::RequestBuilder rb{ctx, 2};
IPC::RequestBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
rb.Push(0x0U);
rb.Push(0x500U);
rb.Skip(1, true);
rb.Push<u32>(0x500);
LOG_WARNING(Service, "(STUBBED) called");
}
Controller::Controller() : ServiceFramework("IpcController") {
static const FunctionInfo functions[] = {
{0x00000000, nullptr, "ConvertSessionToDomain"},
{0x00000000, &Controller::ConvertSessionToDomain, "ConvertSessionToDomain"},
{0x00000001, nullptr, "ConvertDomainToSession"},
{0x00000002, nullptr, "DuplicateSession"},
{0x00000003, &Controller::QueryPointerBufferSize, "QueryPointerBufferSize"},

1
src/core/hle/service/sm/controller.h
View file

@ -15,6 +15,7 @@ public:
~Controller();
private:
void ConvertSessionToDomain(Kernel::HLERequestContext& ctx);
void QueryPointerBufferSize(Kernel::HLERequestContext& ctx);
};

7
src/core/hle/service/sm/sm.cpp
View file

@ -80,7 +80,7 @@ std::shared_ptr<ServiceManager> g_service_manager;
* Inputs:
* 0: 0x00000000
* Outputs:
* 1: ResultCode
* 0: ResultCode
*/
void SM::Initialize(Kernel::HLERequestContext& ctx) {
IPC::RequestBuilder rb{ctx, 1};
@ -89,15 +89,14 @@ void SM::Initialize(Kernel::HLERequestContext& ctx) {
}
/**
* SM::GetServiceHandle service function
* SM::GetService service function
* Inputs:
* 0: 0x00000001
* 1: Unknown
* 2: Unknown
* 3-4: 8-byte UTF-8 service name
* Outputs:
* 1: ResultCode
* 3: Service handle
* 0: ResultCode
*/
void SM::GetService(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};