diff options
| -rw-r--r-- | src/core/hle/function_wrappers.h | 12 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 10 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index abc2b96a8..528208178 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -42,9 +42,17 @@ void Wrap() { FuncReturn(func(PARAM(0), PARAM(1)).raw); } -template <ResultCode func(u64, u64, u64)> +template <ResultCode func(u64, u64, s64)> void Wrap() { - FuncReturn(func(PARAM(0), PARAM(1), PARAM(2)).raw); + FuncReturn(func(PARAM(1), PARAM(2), (s64)PARAM(3)).raw); +} + +template <ResultCode func(u64*, u64)> +void Wrap() { + u64 param_1 = 0; + u32 retval = func(¶m_1, PARAM(1)).raw; + Core::CPU().SetReg(1, param_1); + FuncReturn(retval); } template <ResultCode func(u64*, u64, u64, u64)> diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 4b5c1dff3..ae0ceb252 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -24,6 +24,14 @@ using Kernel::SharedPtr; namespace SVC { +/// Set the process heap to a given Size. It can both extend and shrink the heap. +static ResultCode SetHeapSize(VAddr* heap_addr, u64 heap_size) { + LOG_TRACE(Kernel_SVC, "called, heap_size=%ull", heap_size); + auto& process = *Kernel::g_current_process; + CASCADE_RESULT(*heap_addr, process.HeapAllocate(Memory::HEAP_VADDR, heap_size, Kernel::VMAPermission::ReadWrite)); + return RESULT_SUCCESS; +} + /// Connect to an OS service given the port name, returns the handle to the port to out static ResultCode ConnectToPort(Kernel::Handle* out_handle, VAddr port_name_address) { if (!Memory::IsValidVirtualAddress(port_name_address)) @@ -205,7 +213,7 @@ struct FunctionDef { static const FunctionDef SVC_Table[] = { {0x00, nullptr, "Unknown"}, - {0x01, nullptr, "svcSetHeapSize"}, + {0x01, HLE::Wrap<SetHeapSize>, "svcSetHeapSize"}, {0x02, nullptr, "svcSetMemoryPermission"}, {0x03, nullptr, "svcSetMemoryAttribute"}, {0x04, nullptr, "svcMapMemory"}, |