svc: Stub ResetSignal and CreateTransferMemory

This commit is contained in:
Subv 2018-01-07 21:24:19 -05:00 committed by bunnei
parent 0a1278081e
commit ba02f0deef
2 changed files with 28 additions and 3 deletions

View File

@ -9,6 +9,7 @@
#include "core/hle/kernel/client_port.h" #include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/client_session.h" #include "core/hle/kernel/client_session.h"
#include "core/hle/kernel/condition_variable.h" #include "core/hle/kernel/condition_variable.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/mutex.h" #include "core/hle/kernel/mutex.h"
#include "core/hle/kernel/object_address_table.h" #include "core/hle/kernel/object_address_table.h"
@ -647,6 +648,22 @@ static ResultCode CloseHandle(Handle handle) {
return g_handle_table.Close(handle); return g_handle_table.Close(handle);
} }
/// Reset an event
static ResultCode ResetSignal(Handle handle) {
LOG_WARNING(Kernel_SVC, "(STUBBED) called handle 0x%08X", handle);
auto event = g_handle_table.Get<Event>(handle);
ASSERT(event != nullptr);
event->Clear();
return RESULT_SUCCESS;
}
/// Creates a TransferMemory object
static ResultCode CreateTransferMemory(Handle* handle, VAddr addr, u64 size, u32 permissions) {
LOG_WARNING(Kernel_SVC, "(STUBBED) called addr=0x%llx, size=0x%llx, perms=%08X", addr, size, permissions);
*handle = 0;
return RESULT_SUCCESS;
}
namespace { namespace {
struct FunctionDef { struct FunctionDef {
using Func = void(); using Func = void();
@ -661,7 +678,7 @@ static const FunctionDef SVC_Table[] = {
{0x00, nullptr, "Unknown"}, {0x00, nullptr, "Unknown"},
{0x01, SvcWrap<SetHeapSize>, "SetHeapSize"}, {0x01, SvcWrap<SetHeapSize>, "SetHeapSize"},
{0x02, nullptr, "SetMemoryPermission"}, {0x02, nullptr, "SetMemoryPermission"},
{0x03, nullptr, "SetMemoryAttribute"}, {0x03, SvcWrap<SetMemoryAttribute>, "SetMemoryAttribute"},
{0x04, SvcWrap<MapMemory>, "MapMemory"}, {0x04, SvcWrap<MapMemory>, "MapMemory"},
{0x05, SvcWrap<UnmapMemory>, "UnmapMemory"}, {0x05, SvcWrap<UnmapMemory>, "UnmapMemory"},
{0x06, SvcWrap<QueryMemory>, "QueryMemory"}, {0x06, SvcWrap<QueryMemory>, "QueryMemory"},
@ -679,9 +696,9 @@ static const FunctionDef SVC_Table[] = {
{0x12, nullptr, "ClearEvent"}, {0x12, nullptr, "ClearEvent"},
{0x13, nullptr, "MapSharedMemory"}, {0x13, nullptr, "MapSharedMemory"},
{0x14, nullptr, "UnmapSharedMemory"}, {0x14, nullptr, "UnmapSharedMemory"},
{0x15, nullptr, "CreateTransferMemory"}, {0x15, SvcWrap<CreateTransferMemory>, "CreateTransferMemory"},
{0x16, SvcWrap<CloseHandle>, "CloseHandle"}, {0x16, SvcWrap<CloseHandle>, "CloseHandle"},
{0x17, nullptr, "ResetSignal"}, {0x17, SvcWrap<ResetSignal>, "ResetSignal"},
{0x18, SvcWrap<WaitSynchronization>, "WaitSynchronization"}, {0x18, SvcWrap<WaitSynchronization>, "WaitSynchronization"},
{0x19, SvcWrap<CancelSynchronization>, "CancelSynchronization"}, {0x19, SvcWrap<CancelSynchronization>, "CancelSynchronization"},
{0x1A, SvcWrap<LockMutex>, "LockMutex"}, {0x1A, SvcWrap<LockMutex>, "LockMutex"},

View File

@ -132,6 +132,14 @@ void SvcWrap() {
FuncReturn(retval); FuncReturn(retval);
} }
template <ResultCode func(u32*, u64, u64, u32)>
void SvcWrap() {
u32 param_1 = 0;
u32 retval = func(&param_1, PARAM(1), PARAM(2), (u32)(PARAM(3) & 0xFFFFFFFF)).raw;
Core::CPU().SetReg(1, param_1);
FuncReturn(retval);
}
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Function wrappers that return type u32 // Function wrappers that return type u32