VERY experimental Nintendo Switch 2 emulator
C++
[kernel] Implement code address offset for Skyline compatibility (#2858)
JPikachuead5978b3456
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cppindex 51f86b2afd..355a2a5f3b 100644--- a/src/core/hle/kernel/k_process.cpp+++ b/src/core/hle/kernel/k_process.cpp@@ -28,6 +28,9 @@ namespace Kernel {namespace {+// TODO: Remove this workaround when proper ASLR is implemented for all address spaces.+constexpr u64 CodeStartOffset = 0x500000UL;+Result TerminateChildren(KernelCore& kernel, KProcess* process,const KThread* thread_to_not_terminate) {// Request that all children threads terminate.@@ -1198,11 +1201,11 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std:break;case FileSys::ProgramAddressSpaceType::Is32Bit:flag |= Svc::CreateProcessFlag::AddressSpace32Bit;- code_address = 0x20'0000;+ code_address = 0x20'0000 + CodeStartOffset;break;case FileSys::ProgramAddressSpaceType::Is32BitNoMap:flag |= Svc::CreateProcessFlag::AddressSpace32BitWithoutAlias;- code_address = 0x20'0000;+ code_address = 0x20'0000 + CodeStartOffset;break;}diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cppindex 8370e62bc4..2e1187f6e5 100644--- a/src/core/hle/kernel/svc.cpp+++ b/src/core/hle/kernel/svc.cpp@@ -1828,6 +1828,10 @@ static void SvcWrap_SetProcessMemoryPermission64From32(Core::System& system, stduint64_t size{};MemoryPermission perm{};+ LOG_DEBUG(Kernel_SVC, "Raw args, [0]={:#x} [1]={:#x} [2]={:#x} [3]={:#x} [4]={:#x} [5]={:#x}",+ GetArg32(args, 0), GetArg32(args, 1), GetArg32(args, 2),+ GetArg32(args, 3), GetArg32(args, 4), GetArg32(args, 5));+process_handle = Convert<Handle>(GetArg32(args, 0));std::array<uint32_t, 2> address_gather{};address_gather[0] = GetArg32(args, 2);@@ -1915,6 +1919,10 @@ static void SvcWrap_MapProcessCodeMemory64From32(Core::System& system, std::spanuint64_t src_address{};uint64_t size{};+ LOG_DEBUG(Kernel_SVC, "Raw args, [0]={:#x} [1]={:#x} [2]={:#x} [3]={:#x} [4]={:#x} [5]={:#x} [6]={:#x}",+ GetArg32(args, 0), GetArg32(args, 1), GetArg32(args, 2),+ GetArg32(args, 3), GetArg32(args, 4), GetArg32(args, 5), GetArg32(args, 6));+process_handle = Convert<Handle>(GetArg32(args, 0));std::array<uint32_t, 2> dst_address_gather{};dst_address_gather[0] = GetArg32(args, 2);@@ -1942,6 +1950,10 @@ static void SvcWrap_UnmapProcessCodeMemory64From32(Core::System& system, std::spuint64_t src_address{};uint64_t size{};+ LOG_DEBUG(Kernel_SVC, "Raw args, [0]={:#x} [1]={:#x} [2]={:#x} [3]={:#x} [4]={:#x} [5]={:#x} [6]={:#x}",+ GetArg32(args, 0), GetArg32(args, 1), GetArg32(args, 2),+ GetArg32(args, 3), GetArg32(args, 4), GetArg32(args, 5), GetArg32(args, 6));+process_handle = Convert<Handle>(GetArg32(args, 0));std::array<uint32_t, 2> dst_address_gather{};dst_address_gather[0] = GetArg32(args, 2);@@ -1956,6 +1968,9 @@ static void SvcWrap_UnmapProcessCodeMemory64From32(Core::System& system, std::spsize_gather[1] = GetArg32(args, 6);size = Convert<uint64_t>(size_gather);+ LOG_DEBUG(Kernel_SVC, "Reconstructed, handle={:#x} dst={:#x} src={:#x} size={:#x}",+ process_handle, dst_address, src_address, size);+ret = UnmapProcessCodeMemory64From32(system, process_handle, dst_address, src_address, size);SetArg32(args, 0, Convert<uint32_t>(ret));