- added debug logging to syscall.cpp
- added stubbed HLE syscall functions for svc_GetResourceLimit and svc_GetResourceLimitCurrentValues
This commit is contained in:
bunnei
parent
a3a383cb7a
commit
de36d82dde
@ -729,7 +729,17 @@ template<int func(int, const char *, u32, void *, int, int, int)> void WrapI_ICU
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<int func(void *, u32, u32, u32, u32, u32)> void WrapI_VUUUUU(){
|
||||
template<int func(void*, u32)> void WrapI_VU(){
|
||||
u32 retval = func(Memory::GetPointer(PARAM(0)), PARAM(1));
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<int func(void*, u32, void*, int)> void WrapI_VUVI(){
|
||||
u32 retval = func(Memory::GetPointer(PARAM(0)), PARAM(1), Memory::GetPointer(PARAM(2)), PARAM(3));
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<int func(void*, u32, u32, u32, u32, u32)> void WrapI_VUUUUU(){
|
||||
u32 retval = func(Memory::GetPointer(PARAM(0)), PARAM(1), PARAM(2), PARAM(3), PARAM(4), PARAM(5));
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
@ -29,6 +29,9 @@ enum MapMemoryPermission {
|
||||
Result ControlMemory(u32 operation, u32 addr0, u32 addr1, u32 size, u32 permissions) {
|
||||
u32 virtual_address = 0x00000000;
|
||||
|
||||
DEBUG_LOG(SVC, "ControlMemory called operation=0x%08X, addr0=0x%08X, addr1=0x%08X, size=%08X, permissions=0x%08X",
|
||||
operation, addr0, addr1, size, permissions);
|
||||
|
||||
switch (operation) {
|
||||
|
||||
// Map normal heap memory
|
||||
@ -43,16 +46,18 @@ Result ControlMemory(u32 operation, u32 addr0, u32 addr1, u32 size, u32 permissi
|
||||
|
||||
// Unknown ControlMemory operation
|
||||
default:
|
||||
ERROR_LOG(OSHLE, "Unknown ControlMemory operation %08X", operation);
|
||||
ERROR_LOG(SVC, "ControlMemory unknown operation=0x%08X", operation);
|
||||
}
|
||||
|
||||
DEBUG_LOG(SVC, "...returned virtual_address=0x%08X", virtual_address);
|
||||
Core::g_app_core->SetReg(1, virtual_address);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Maps a memory block to specified address
|
||||
Result MapMemoryBlock(Handle memblock, u32 addr, u32 mypermissions, u32 otherpermission) {
|
||||
int x = 0;
|
||||
DEBUG_LOG(SVC, "MapMemoryBlock called memblock=0x08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d",
|
||||
memblock, addr, mypermissions, otherpermission);
|
||||
switch (mypermissions) {
|
||||
case MEMORY_PERMISSION_NORMAL:
|
||||
case MEMORY_PERMISSION_NORMAL + 1:
|
||||
@ -60,20 +65,23 @@ Result MapMemoryBlock(Handle memblock, u32 addr, u32 mypermissions, u32 otherper
|
||||
Memory::MapBlock_Shared(memblock, addr, mypermissions);
|
||||
break;
|
||||
default:
|
||||
ERROR_LOG(OSHLE, "Unknown MapMemoryBlock permissions %08X", mypermissions);
|
||||
ERROR_LOG(OSHLE, "MapMemoryBlock unknown permissions=0x%08X", mypermissions);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Connect to an OS service given the port name, returns the handle to the port to out
|
||||
Result ConnectToPort(void* out, const char* port_name) {
|
||||
|
||||
Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
|
||||
Core::g_app_core->SetReg(1, service->GetUID());
|
||||
DEBUG_LOG(SVC, "ConnectToPort called port_name=%s", port_name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Synchronize to an OS service
|
||||
Result SendSyncRequest(Handle session) {
|
||||
DEBUG_LOG(SVC, "SendSyncRequest called session=0x%08X");
|
||||
Service::Interface* service = Service::g_manager->FetchFromUID(session);
|
||||
service->Sync();
|
||||
return 0;
|
||||
@ -82,157 +90,177 @@ Result SendSyncRequest(Handle session) {
|
||||
/// Close a handle
|
||||
Result CloseHandle(Handle handle) {
|
||||
// ImplementMe
|
||||
NOTICE_LOG(OSHLE, "stubbed function CloseHandle");
|
||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) CloseHandle called handle=0x%08X", handle);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Wait for a handle to synchronize, timeout after the specified nanoseconds
|
||||
Result WaitSynchronization1(Handle handle, s64 nanoseconds) {
|
||||
// ImplementMe
|
||||
NOTICE_LOG(OSHLE, "stubbed function WaitSynchronization1");
|
||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) WaitSynchronization1 called handle=0x%08X, nanoseconds=%d",
|
||||
handle, nanoseconds);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Create an address arbiter (to allocate access to shared resources)
|
||||
Result CreateAddressArbiter(void* arbiter) {
|
||||
// ImplementMe
|
||||
NOTICE_LOG(OSHLE, "stubbed function CreateAddressArbiter");
|
||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) CreateAddressArbiter called");
|
||||
Core::g_app_core->SetReg(1, 0xDEADBEEF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Used to output a message on a debug hardware unit - does nothing on a retail unit
|
||||
void OutputDebugString(const char* string) {
|
||||
NOTICE_LOG(OSHLE, "## OSDEBUG: %s", string);
|
||||
NOTICE_LOG(SVC, "## OSDEBUG: %08X %s", Core::g_app_core->GetPC(), string);
|
||||
}
|
||||
|
||||
/// Get resource limit
|
||||
Result GetResourceLimit(void* resource_limit, Handle process) {
|
||||
// With regards to proceess values:
|
||||
// 0xFFFF8001 is a handle alias for the current KProcess, and 0xFFFF8000 is a handle alias for
|
||||
// the current KThread.
|
||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) GetResourceLimit called process=0x%08X", process);
|
||||
Core::g_app_core->SetReg(1, 0xDEADBEEF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Get resource limit current values
|
||||
Result GetResourceLimitCurrentValues(void* _values, Handle resource_limit, void* names, s32 name_count) {
|
||||
//s64* values = (s64*)_values;
|
||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) GetResourceLimitCurrentValues called resource_limit=%08X, names=%s, name_count=%d",
|
||||
resource_limit, names, name_count);
|
||||
Memory::Write32(Core::g_app_core->GetReg(0), 0); // Normmatt: Set used memory to 0 for now
|
||||
return 0;
|
||||
}
|
||||
|
||||
const HLE::FunctionDef Syscall_Table[] = {
|
||||
{0x00, NULL, "Unknown"},
|
||||
{0x01, WrapI_UUUUU<ControlMemory>, "ControlMemory"},
|
||||
{0x02, NULL, "QueryMemory"},
|
||||
{0x03, NULL, "ExitProcess"},
|
||||
{0x04, NULL, "GetProcessAffinityMask"},
|
||||
{0x05, NULL, "SetProcessAffinityMask"},
|
||||
{0x06, NULL, "GetProcessIdealProcessor"},
|
||||
{0x07, NULL, "SetProcessIdealProcessor"},
|
||||
{0x08, NULL, "CreateThread"},
|
||||
{0x09, NULL, "ExitThread"},
|
||||
{0x0A, NULL, "SleepThread"},
|
||||
{0x0B, NULL, "GetThreadPriority"},
|
||||
{0x0C, NULL, "SetThreadPriority"},
|
||||
{0x0D, NULL, "GetThreadAffinityMask"},
|
||||
{0x0E, NULL, "SetThreadAffinityMask"},
|
||||
{0x0F, NULL, "GetThreadIdealProcessor"},
|
||||
{0x10, NULL, "SetThreadIdealProcessor"},
|
||||
{0x11, NULL, "GetCurrentProcessorNumber"},
|
||||
{0x12, NULL, "Run"},
|
||||
{0x13, NULL, "CreateMutex"},
|
||||
{0x14, NULL, "ReleaseMutex"},
|
||||
{0x15, NULL, "CreateSemaphore"},
|
||||
{0x16, NULL, "ReleaseSemaphore"},
|
||||
{0x17, NULL, "CreateEvent"},
|
||||
{0x18, NULL, "SignalEvent"},
|
||||
{0x19, NULL, "ClearEvent"},
|
||||
{0x1A, NULL, "CreateTimer"},
|
||||
{0x1B, NULL, "SetTimer"},
|
||||
{0x1C, NULL, "CancelTimer"},
|
||||
{0x1D, NULL, "ClearTimer"},
|
||||
{0x1E, NULL, "CreateMemoryBlock"},
|
||||
{0x1F, WrapI_UUUU<MapMemoryBlock>, "MapMemoryBlock"},
|
||||
{0x20, NULL, "UnmapMemoryBlock"},
|
||||
{0x21, WrapI_V<CreateAddressArbiter>, "CreateAddressArbiter"},
|
||||
{0x22, NULL, "ArbitrateAddress"},
|
||||
{0x23, WrapI_U<CloseHandle>, "CloseHandle"},
|
||||
{0x24, WrapI_US64<WaitSynchronization1>, "WaitSynchronization1"},
|
||||
{0x25, NULL, "WaitSynchronizationN"},
|
||||
{0x26, NULL, "SignalAndWait"},
|
||||
{0x27, NULL, "DuplicateHandle"},
|
||||
{0x28, NULL, "GetSystemTick"},
|
||||
{0x29, NULL, "GetHandleInfo"},
|
||||
{0x2A, NULL, "GetSystemInfo"},
|
||||
{0x2B, NULL, "GetProcessInfo"},
|
||||
{0x2C, NULL, "GetThreadInfo"},
|
||||
{0x2D, WrapI_VC<ConnectToPort>, "ConnectToPort"},
|
||||
{0x2E, NULL, "SendSyncRequest1"},
|
||||
{0x2F, NULL, "SendSyncRequest2"},
|
||||
{0x30, NULL, "SendSyncRequest3"},
|
||||
{0x31, NULL, "SendSyncRequest4"},
|
||||
{0x32, WrapI_U<SendSyncRequest>, "SendSyncRequest"},
|
||||
{0x33, NULL, "OpenProcess"},
|
||||
{0x34, NULL, "OpenThread"},
|
||||
{0x35, NULL, "GetProcessId"},
|
||||
{0x36, NULL, "GetProcessIdOfThread"},
|
||||
{0x37, NULL, "GetThreadId"},
|
||||
{0x38, NULL, "GetResourceLimit"},
|
||||
{0x39, NULL, "GetResourceLimitLimitValues"},
|
||||
{0x3A, NULL, "GetResourceLimitCurrentValues"},
|
||||
{0x3B, NULL, "GetThreadContext"},
|
||||
{0x3C, NULL, "Break"},
|
||||
{0x3D, WrapV_C<OutputDebugString>, "OutputDebugString"},
|
||||
{0x3E, NULL, "ControlPerformanceCounter"},
|
||||
{0x3F, NULL, "Unknown"},
|
||||
{0x40, NULL, "Unknown"},
|
||||
{0x41, NULL, "Unknown"},
|
||||
{0x42, NULL, "Unknown"},
|
||||
{0x43, NULL, "Unknown"},
|
||||
{0x44, NULL, "Unknown"},
|
||||
{0x45, NULL, "Unknown"},
|
||||
{0x46, NULL, "Unknown"},
|
||||
{0x47, NULL, "CreatePort"},
|
||||
{0x48, NULL, "CreateSessionToPort"},
|
||||
{0x49, NULL, "CreateSession"},
|
||||
{0x4A, NULL, "AcceptSession"},
|
||||
{0x4B, NULL, "ReplyAndReceive1"},
|
||||
{0x4C, NULL, "ReplyAndReceive2"},
|
||||
{0x4D, NULL, "ReplyAndReceive3"},
|
||||
{0x4E, NULL, "ReplyAndReceive4"},
|
||||
{0x4F, NULL, "ReplyAndReceive"},
|
||||
{0x50, NULL, "BindInterrupt"},
|
||||
{0x51, NULL, "UnbindInterrupt"},
|
||||
{0x52, NULL, "InvalidateProcessDataCache"},
|
||||
{0x53, NULL, "StoreProcessDataCache"},
|
||||
{0x54, NULL, "FlushProcessDataCache"},
|
||||
{0x55, NULL, "StartInterProcessDma"},
|
||||
{0x56, NULL, "StopDma"},
|
||||
{0x57, NULL, "GetDmaState"},
|
||||
{0x58, NULL, "RestartDma"},
|
||||
{0x59, NULL, "Unknown"},
|
||||
{0x5A, NULL, "Unknown"},
|
||||
{0x5B, NULL, "Unknown"},
|
||||
{0x5C, NULL, "Unknown"},
|
||||
{0x5D, NULL, "Unknown"},
|
||||
{0x5E, NULL, "Unknown"},
|
||||
{0x5F, NULL, "Unknown"},
|
||||
{0x60, NULL, "DebugActiveProcess"},
|
||||
{0x61, NULL, "BreakDebugProcess"},
|
||||
{0x62, NULL, "TerminateDebugProcess"},
|
||||
{0x63, NULL, "GetProcessDebugEvent"},
|
||||
{0x64, NULL, "ContinueDebugEvent"},
|
||||
{0x65, NULL, "GetProcessList"},
|
||||
{0x66, NULL, "GetThreadList"},
|
||||
{0x67, NULL, "GetDebugThreadContext"},
|
||||
{0x68, NULL, "SetDebugThreadContext"},
|
||||
{0x69, NULL, "QueryDebugProcessMemory"},
|
||||
{0x6A, NULL, "ReadProcessMemory"},
|
||||
{0x6B, NULL, "WriteProcessMemory"},
|
||||
{0x6C, NULL, "SetHardwareBreakPoint"},
|
||||
{0x6D, NULL, "GetDebugThreadParam"},
|
||||
{0x6E, NULL, "Unknown"},
|
||||
{0x6F, NULL, "Unknown"},
|
||||
{0x70, NULL, "ControlProcessMemory"},
|
||||
{0x71, NULL, "MapProcessMemory"},
|
||||
{0x72, NULL, "UnmapProcessMemory"},
|
||||
{0x73, NULL, "Unknown"},
|
||||
{0x74, NULL, "Unknown"},
|
||||
{0x75, NULL, "Unknown"},
|
||||
{0x76, NULL, "TerminateProcess"},
|
||||
{0x77, NULL, "Unknown"},
|
||||
{0x78, NULL, "CreateResourceLimit"},
|
||||
{0x79, NULL, "Unknown"},
|
||||
{0x7A, NULL, "Unknown"},
|
||||
{0x7B, NULL, "Unknown"},
|
||||
{0x7C, NULL, "KernelSetState"},
|
||||
{0x7D, NULL, "QueryProcessMemory"},
|
||||
{0x00, NULL, "Unknown"},
|
||||
{0x01, WrapI_UUUUU<ControlMemory>, "ControlMemory"},
|
||||
{0x02, NULL, "QueryMemory"},
|
||||
{0x03, NULL, "ExitProcess"},
|
||||
{0x04, NULL, "GetProcessAffinityMask"},
|
||||
{0x05, NULL, "SetProcessAffinityMask"},
|
||||
{0x06, NULL, "GetProcessIdealProcessor"},
|
||||
{0x07, NULL, "SetProcessIdealProcessor"},
|
||||
{0x08, NULL, "CreateThread"},
|
||||
{0x09, NULL, "ExitThread"},
|
||||
{0x0A, NULL, "SleepThread"},
|
||||
{0x0B, NULL, "GetThreadPriority"},
|
||||
{0x0C, NULL, "SetThreadPriority"},
|
||||
{0x0D, NULL, "GetThreadAffinityMask"},
|
||||
{0x0E, NULL, "SetThreadAffinityMask"},
|
||||
{0x0F, NULL, "GetThreadIdealProcessor"},
|
||||
{0x10, NULL, "SetThreadIdealProcessor"},
|
||||
{0x11, NULL, "GetCurrentProcessorNumber"},
|
||||
{0x12, NULL, "Run"},
|
||||
{0x13, NULL, "CreateMutex"},
|
||||
{0x14, NULL, "ReleaseMutex"},
|
||||
{0x15, NULL, "CreateSemaphore"},
|
||||
{0x16, NULL, "ReleaseSemaphore"},
|
||||
{0x17, NULL, "CreateEvent"},
|
||||
{0x18, NULL, "SignalEvent"},
|
||||
{0x19, NULL, "ClearEvent"},
|
||||
{0x1A, NULL, "CreateTimer"},
|
||||
{0x1B, NULL, "SetTimer"},
|
||||
{0x1C, NULL, "CancelTimer"},
|
||||
{0x1D, NULL, "ClearTimer"},
|
||||
{0x1E, NULL, "CreateMemoryBlock"},
|
||||
{0x1F, WrapI_UUUU<MapMemoryBlock>, "MapMemoryBlock"},
|
||||
{0x20, NULL, "UnmapMemoryBlock"},
|
||||
{0x21, WrapI_V<CreateAddressArbiter>, "CreateAddressArbiter"},
|
||||
{0x22, NULL, "ArbitrateAddress"},
|
||||
{0x23, WrapI_U<CloseHandle>, "CloseHandle"},
|
||||
{0x24, WrapI_US64<WaitSynchronization1>, "WaitSynchronization1"},
|
||||
{0x25, NULL, "WaitSynchronizationN"},
|
||||
{0x26, NULL, "SignalAndWait"},
|
||||
{0x27, NULL, "DuplicateHandle"},
|
||||
{0x28, NULL, "GetSystemTick"},
|
||||
{0x29, NULL, "GetHandleInfo"},
|
||||
{0x2A, NULL, "GetSystemInfo"},
|
||||
{0x2B, NULL, "GetProcessInfo"},
|
||||
{0x2C, NULL, "GetThreadInfo"},
|
||||
{0x2D, WrapI_VC<ConnectToPort>, "ConnectToPort"},
|
||||
{0x2E, NULL, "SendSyncRequest1"},
|
||||
{0x2F, NULL, "SendSyncRequest2"},
|
||||
{0x30, NULL, "SendSyncRequest3"},
|
||||
{0x31, NULL, "SendSyncRequest4"},
|
||||
{0x32, WrapI_U<SendSyncRequest>, "SendSyncRequest"},
|
||||
{0x33, NULL, "OpenProcess"},
|
||||
{0x34, NULL, "OpenThread"},
|
||||
{0x35, NULL, "GetProcessId"},
|
||||
{0x36, NULL, "GetProcessIdOfThread"},
|
||||
{0x37, NULL, "GetThreadId"},
|
||||
{0x38, WrapI_VU<GetResourceLimit>, "GetResourceLimit"},
|
||||
{0x39, NULL, "GetResourceLimitLimitValues"},
|
||||
{0x3A, WrapI_VUVI<GetResourceLimitCurrentValues>, "GetResourceLimitCurrentValues"},
|
||||
{0x3B, NULL, "GetThreadContext"},
|
||||
{0x3C, NULL, "Break"},
|
||||
{0x3D, WrapV_C<OutputDebugString>, "OutputDebugString"},
|
||||
{0x3E, NULL, "ControlPerformanceCounter"},
|
||||
{0x3F, NULL, "Unknown"},
|
||||
{0x40, NULL, "Unknown"},
|
||||
{0x41, NULL, "Unknown"},
|
||||
{0x42, NULL, "Unknown"},
|
||||
{0x43, NULL, "Unknown"},
|
||||
{0x44, NULL, "Unknown"},
|
||||
{0x45, NULL, "Unknown"},
|
||||
{0x46, NULL, "Unknown"},
|
||||
{0x47, NULL, "CreatePort"},
|
||||
{0x48, NULL, "CreateSessionToPort"},
|
||||
{0x49, NULL, "CreateSession"},
|
||||
{0x4A, NULL, "AcceptSession"},
|
||||
{0x4B, NULL, "ReplyAndReceive1"},
|
||||
{0x4C, NULL, "ReplyAndReceive2"},
|
||||
{0x4D, NULL, "ReplyAndReceive3"},
|
||||
{0x4E, NULL, "ReplyAndReceive4"},
|
||||
{0x4F, NULL, "ReplyAndReceive"},
|
||||
{0x50, NULL, "BindInterrupt"},
|
||||
{0x51, NULL, "UnbindInterrupt"},
|
||||
{0x52, NULL, "InvalidateProcessDataCache"},
|
||||
{0x53, NULL, "StoreProcessDataCache"},
|
||||
{0x54, NULL, "FlushProcessDataCache"},
|
||||
{0x55, NULL, "StartInterProcessDma"},
|
||||
{0x56, NULL, "StopDma"},
|
||||
{0x57, NULL, "GetDmaState"},
|
||||
{0x58, NULL, "RestartDma"},
|
||||
{0x59, NULL, "Unknown"},
|
||||
{0x5A, NULL, "Unknown"},
|
||||
{0x5B, NULL, "Unknown"},
|
||||
{0x5C, NULL, "Unknown"},
|
||||
{0x5D, NULL, "Unknown"},
|
||||
{0x5E, NULL, "Unknown"},
|
||||
{0x5F, NULL, "Unknown"},
|
||||
{0x60, NULL, "DebugActiveProcess"},
|
||||
{0x61, NULL, "BreakDebugProcess"},
|
||||
{0x62, NULL, "TerminateDebugProcess"},
|
||||
{0x63, NULL, "GetProcessDebugEvent"},
|
||||
{0x64, NULL, "ContinueDebugEvent"},
|
||||
{0x65, NULL, "GetProcessList"},
|
||||
{0x66, NULL, "GetThreadList"},
|
||||
{0x67, NULL, "GetDebugThreadContext"},
|
||||
{0x68, NULL, "SetDebugThreadContext"},
|
||||
{0x69, NULL, "QueryDebugProcessMemory"},
|
||||
{0x6A, NULL, "ReadProcessMemory"},
|
||||
{0x6B, NULL, "WriteProcessMemory"},
|
||||
{0x6C, NULL, "SetHardwareBreakPoint"},
|
||||
{0x6D, NULL, "GetDebugThreadParam"},
|
||||
{0x6E, NULL, "Unknown"},
|
||||
{0x6F, NULL, "Unknown"},
|
||||
{0x70, NULL, "ControlProcessMemory"},
|
||||
{0x71, NULL, "MapProcessMemory"},
|
||||
{0x72, NULL, "UnmapProcessMemory"},
|
||||
{0x73, NULL, "Unknown"},
|
||||
{0x74, NULL, "Unknown"},
|
||||
{0x75, NULL, "Unknown"},
|
||||
{0x76, NULL, "TerminateProcess"},
|
||||
{0x77, NULL, "Unknown"},
|
||||
{0x78, NULL, "CreateResourceLimit"},
|
||||
{0x79, NULL, "Unknown"},
|
||||
{0x7A, NULL, "Unknown"},
|
||||
{0x7B, NULL, "Unknown"},
|
||||
{0x7C, NULL, "KernelSetState"},
|
||||
{0x7D, NULL, "QueryProcessMemory"},
|
||||
};
|
||||
|
||||
void Register() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user