Android changes

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs

@@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Applets
 {
     internal class SoftwareKeyboardApplet : IApplet
     {
-        private const string DefaultInputText = "Ryujinx";
+        private const string DefaultInputText = "Kenji-NX";
 
         private const int StandardBufferSize = 0x7D8;
         private const int InteractiveBufferSize = 0x7D4;

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs

@@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
         {
             int ryujinxLogoSize = 32;
 
-            string ryujinxIconPath = "Ryujinx.HLE.HOS.Applets.SoftwareKeyboard.Resources.Logo_Ryujinx.png";
+            string ryujinxIconPath = "Ryujinx.HLE.HOS.Applets.SoftwareKeyboard.Resources.Logo_Kenjinx.png";
             _ryujinxLogo = LoadResource(typeof(SoftwareKeyboardRendererBase).Assembly, ryujinxIconPath, ryujinxLogoSize, ryujinxLogoSize);
 
             string padAcceptIconPath = "Ryujinx.HLE.HOS.Applets.SoftwareKeyboard.Resources.Icon_BtnA.png";

src/Ryujinx.HLE/HOS/ArmProcessContext.cs

@@ -24,6 +24,8 @@ namespace Ryujinx.HLE.HOS
         private readonly ICpuContext _cpuContext;
         private T _memoryManager;
 
+        public ulong ReservedSize { get; }
+
         public IVirtualMemoryManager AddressSpace => _memoryManager;
 
         public ulong AddressSpaceSize { get; }
@@ -34,7 +36,8 @@ namespace Ryujinx.HLE.HOS
             GpuContext gpuContext,
             T memoryManager,
             ulong addressSpaceSize,
-            bool for64Bit)
+            bool for64Bit,
+            ulong reservedSize = 0UL)
         {
             if (memoryManager is IRefCounted rc)
             {
@@ -47,8 +50,8 @@ namespace Ryujinx.HLE.HOS
             _gpuContext = gpuContext;
             _cpuContext = cpuEngine.CreateCpuContext(memoryManager, for64Bit);
             _memoryManager = memoryManager;
-
             AddressSpaceSize = addressSpaceSize;
+            ReservedSize = reservedSize;
         }
 
         public IExecutionContext CreateExecutionContext(ExceptionCallbacks exceptionCallbacks)

src/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs

@@ -4,6 +4,7 @@ using Ryujinx.Cpu;
 using Ryujinx.Cpu.AppleHv;
 using Ryujinx.Cpu.Jit;
 using Ryujinx.Cpu.LightningJit;
+using Ryujinx.Cpu.Nce;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Kernel;
 using Ryujinx.HLE.HOS.Kernel.Process;
@@ -46,17 +47,43 @@ namespace Ryujinx.HLE.HOS
             _codeSize = codeSize;
         }
 
+        public static NceCpuCodePatch CreateCodePatchForNce(KernelContext context, bool for64Bit, ReadOnlySpan<byte> textSection)
+        {
+            if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64 && for64Bit && context.Device.Configuration.UseHypervisor && !OperatingSystem.IsMacOS())
+            {
+                return NcePatcher.CreatePatch(textSection);
+            }
+
+            return null;
+        }
+
         public IProcessContext Create(KernelContext context, ulong pid, ulong addressSpaceSize, InvalidAccessHandler invalidAccessHandler, bool for64Bit)
         {
             IArmProcessContext processContext;
 
             bool isArm64Host = RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
 
-            if (OperatingSystem.IsMacOS() && isArm64Host && for64Bit && context.Device.Configuration.UseHypervisor)
+            if (isArm64Host && for64Bit && context.Device.Configuration.UseHypervisor)
             {
-                var cpuEngine = new HvEngine(_tickSource);
-                var memoryManager = new HvMemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
-                processContext = new ArmProcessContext<HvMemoryManager>(pid, cpuEngine, _gpu, memoryManager, addressSpaceSize, for64Bit);
+                if (OperatingSystem.IsMacOS())
+                {
+                    var cpuEngine = new HvEngine(_tickSource);
+                    var memoryManager = new HvMemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
+                    processContext = new ArmProcessContext<HvMemoryManager>(pid, cpuEngine, _gpu, memoryManager, addressSpaceSize, for64Bit);
+                }
+                else
+                {
+                    if (!AddressSpace.TryCreateWithoutMirror(addressSpaceSize, out var addressSpace))
+                    {
+                        throw new Exception("Address space creation failed");
+                    }
+
+                    Logger.Info?.Print(LogClass.Cpu, $"NCE Base AS Address: 0x{addressSpace.Pointer.ToInt64():X} Size: 0x{addressSpace.Size:X}");
+
+                    var cpuEngine = new NceEngine(_tickSource);
+                    var memoryManager = new MemoryManagerNative(addressSpace, context.Memory, addressSpaceSize, invalidAccessHandler);
+                    processContext = new ArmProcessContext<MemoryManagerNative>(pid, cpuEngine, _gpu, memoryManager, addressSpace.Size, for64Bit, memoryManager.ReservedSize);
+                }
             }
             else
             {
@@ -74,11 +101,13 @@ namespace Ryujinx.HLE.HOS
                     : new JitEngine(_tickSource);
 
                 AddressSpace addressSpace = null;
+                MemoryBlock asNoMirror = null;
 
                 // We want to use host tracked mode if the host page size is > 4KB.
                 if ((mode == MemoryManagerMode.HostMapped || mode == MemoryManagerMode.HostMappedUnsafe) && MemoryBlock.GetPageSize() <= 0x1000)
                 {
-                    if (!AddressSpace.TryCreate(context.Memory, addressSpaceSize, out addressSpace))
+                    if (!AddressSpace.TryCreate(context.Memory, addressSpaceSize, out addressSpace) &&
+                        !AddressSpace.TryCreateWithoutMirror(addressSpaceSize, out asNoMirror))
                     {
                         Logger.Warning?.Print(LogClass.Cpu, "Address space creation failed, falling back to software page table");
 
@@ -89,35 +118,47 @@ namespace Ryujinx.HLE.HOS
                 switch (mode)
                 {
                     case MemoryManagerMode.SoftwarePageTable:
-                        var memoryManager = new MemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
-                        processContext = new ArmProcessContext<MemoryManager>(pid, cpuEngine, _gpu, memoryManager, addressSpaceSize, for64Bit);
+                        {
+                            var mm = new MemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
+                            processContext = new ArmProcessContext<MemoryManager>(pid, cpuEngine, _gpu, mm, addressSpaceSize, for64Bit);
+                        }
                         break;
 
                     case MemoryManagerMode.HostMapped:
                     case MemoryManagerMode.HostMappedUnsafe:
-                        if (addressSpace == null)
+                        if (addressSpace == null && asNoMirror == null)
                         {
                             var memoryManagerHostTracked = new MemoryManagerHostTracked(context.Memory, addressSpaceSize, mode == MemoryManagerMode.HostMappedUnsafe, invalidAccessHandler);
                             processContext = new ArmProcessContext<MemoryManagerHostTracked>(pid, cpuEngine, _gpu, memoryManagerHostTracked, addressSpaceSize, for64Bit);
                         }
                         else
                         {
-                            if (addressSpaceSize != addressSpace.AddressSpaceSize)
-                            {
-                                Logger.Warning?.Print(LogClass.Emulation, $"Allocated address space (0x{addressSpace.AddressSpaceSize:X}) is smaller than guest application requirements (0x{addressSpaceSize:X})");
-                            }
+                            bool unsafeMode = mode == MemoryManagerMode.HostMappedUnsafe;
 
-                            var memoryManagerHostMapped = new MemoryManagerHostMapped(addressSpace, mode == MemoryManagerMode.HostMappedUnsafe, invalidAccessHandler);
-                            processContext = new ArmProcessContext<MemoryManagerHostMapped>(pid, cpuEngine, _gpu, memoryManagerHostMapped, addressSpace.AddressSpaceSize, for64Bit);
+                            if (addressSpace != null)
+                            {
+                                var mm = new MemoryManagerHostMapped(addressSpace, unsafeMode, invalidAccessHandler);
+                                processContext = new ArmProcessContext<MemoryManagerHostMapped>(pid, cpuEngine, _gpu, mm, addressSpace.AddressSpaceSize, for64Bit);
+                            }
+                            else
+                            {
+                                var mm = new MemoryManagerHostNoMirror(asNoMirror, context.Memory, unsafeMode, invalidAccessHandler);
+                                processContext = new ArmProcessContext<MemoryManagerHostNoMirror>(pid, cpuEngine, _gpu, mm, asNoMirror.Size, for64Bit);
+                            }
                         }
                         break;
 
                     default:
                         throw new InvalidOperationException($"{nameof(mode)} contains an invalid value: {mode}");
                 }
+
+                if (addressSpaceSize != processContext.AddressSpaceSize)
+                {
+                    Logger.Warning?.Print(LogClass.Emulation, $"Allocated address space (0x{processContext.AddressSpaceSize:X}) is smaller than guest application requirements (0x{addressSpaceSize:X})");
+                }
             }
 
-            DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, _diskCacheSelector ?? "default");
+            DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, _diskCacheSelector);
 
             return processContext;
         }

src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         {
             return arrange switch
             {
-                MemoryArrange.MemoryArrange4GiB => 3455 * MiB,
+                MemoryArrange.MemoryArrange4GiB or
                 MemoryArrange.MemoryArrange4GiBSystemDev or
                 MemoryArrange.MemoryArrange6GiBAppletDev => 3285 * MiB,
                 MemoryArrange.MemoryArrange4GiBAppletDev => 2048 * MiB,

src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs

@@ -36,8 +36,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         protected readonly KernelContext Context;
         protected virtual bool UsesPrivateAllocations => false;
 
-        public ulong AddrSpaceStart { get; private set; }
-        public ulong AddrSpaceEnd { get; private set; }
+        public ulong AddressSpaceStart { get; private set; }
+        public ulong AddressSpaceEnd { get; private set; }
 
         public ulong CodeRegionStart { get; private set; }
         public ulong CodeRegionEnd { get; private set; }
@@ -69,6 +69,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         private MemoryRegion _memRegion;
 
         private bool _allocateFromBack;
+
         private readonly bool _isKernel;
 
         private bool _aslrEnabled;
@@ -104,6 +105,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             MemoryRegion memRegion,
             ulong address,
             ulong size,
+            ulong reservedSize,
             KMemoryBlockSlabManager slabManager)
         {
             _contextId = Context.ContextIdManager.GetId();
@@ -119,6 +121,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 memRegion,
                 address,
                 size,
+                reservedSize,
                 slabManager);
 
             if (result != Result.Success)
@@ -161,6 +164,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             MemoryRegion memRegion,
             ulong address,
             ulong size,
+            ulong reservedSize,
             KMemoryBlockSlabManager slabManager)
         {
             ulong endAddr = address + size;
@@ -186,7 +190,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     CodeRegionStart = 0x200000;
                     codeRegionSize = 0x3fe00000;
                     AslrRegionStart = 0x200000;
-                    AslrRegionEnd = AslrRegionStart + 0xffe00000;
+                    AslrRegionEnd = 0x100000000;
                     stackAndTlsIoStart = 0x200000;
                     stackAndTlsIoEnd = 0x40000000;
                     break;
@@ -199,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     CodeRegionStart = 0x8000000;
                     codeRegionSize = 0x78000000;
                     AslrRegionStart = 0x8000000;
-                    AslrRegionEnd = AslrRegionStart + 0xff8000000;
+                    AslrRegionEnd = 0x1000000000;
                     stackAndTlsIoStart = 0x8000000;
                     stackAndTlsIoEnd = 0x80000000;
                     break;
@@ -212,17 +216,18 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     CodeRegionStart = 0x200000;
                     codeRegionSize = 0x3fe00000;
                     AslrRegionStart = 0x200000;
-                    AslrRegionEnd = AslrRegionStart + 0xffe00000;
+                    AslrRegionEnd = 0x100000000;
                     stackAndTlsIoStart = 0x200000;
                     stackAndTlsIoEnd = 0x40000000;
                     break;
 
                 case ProcessCreationFlags.AddressSpace64Bit:
+                    ulong reservedAddressSpaceSize = _reservedAddressSpaceSize;
                     if (_reservedAddressSpaceSize < addrSpaceEnd)
                     {
-                        int addressSpaceWidth = (int)ulong.Log2(_reservedAddressSpaceSize);
+                        int addressSpaceWidth = (int)ulong.Log2(reservedAddressSpaceSize);
 
-                        aliasRegion.Size = 1UL << (addressSpaceWidth - 3);
+                        aliasRegion.Size = reservedAddressSpaceSize >= 0x1800000000 ? 0x1000000000 : 1UL << (addressSpaceWidth - 3);
                         heapRegion.Size = 0x180000000;
                         stackRegion.Size = 1UL << (addressSpaceWidth - 8);
                         tlsIoRegion.Size = 1UL << (addressSpaceWidth - 3);
@@ -230,8 +235,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                         codeRegionSize = BitUtils.AlignUp(endAddr, RegionAlignment) - CodeRegionStart;
                         stackAndTlsIoStart = 0;
                         stackAndTlsIoEnd = 0;
-                        AslrRegionStart = 0x8000000;
-                        addrSpaceEnd = 1UL << addressSpaceWidth;
+                        AslrRegionStart = Math.Max(reservedSize, 0x8000000);
+                        addrSpaceEnd = reservedSize + reservedAddressSpaceSize;
                         AslrRegionEnd = addrSpaceEnd;
                     }
                     else
@@ -242,8 +247,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                         tlsIoRegion.Size = 0x1000000000;
                         CodeRegionStart = BitUtils.AlignDown(address, RegionAlignment);
                         codeRegionSize = BitUtils.AlignUp(endAddr, RegionAlignment) - CodeRegionStart;
-                        AslrRegionStart = 0x8000000;
-                        AslrRegionEnd = AslrRegionStart + 0x7ff8000000;
+                        AslrRegionStart = Math.Max(reservedSize, 0x8000000);
+                        AslrRegionEnd = 0x8000000000;
                         stackAndTlsIoStart = 0;
                         stackAndTlsIoEnd = 0;
                     }
@@ -285,8 +290,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
             _aslrEnabled = aslrEnabled;
 
-            AddrSpaceStart = addrSpaceStart;
-            AddrSpaceEnd = addrSpaceEnd;
+            AddressSpaceStart = addrSpaceStart;
+            AddressSpaceEnd = addrSpaceEnd;
 
             _slabManager = slabManager;
 
@@ -309,10 +314,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             aliasRegion.End = aliasRegion.Start + aliasRegion.Size;
             heapRegion.Start = mapBaseAddress + heapRegion.AslrOffset;
             heapRegion.End = heapRegion.Start + heapRegion.Size;
-            stackRegion.Start = mapBaseAddress + stackRegion.AslrOffset;
-            stackRegion.End = stackRegion.Start + stackRegion.Size;
-            tlsIoRegion.Start = mapBaseAddress + tlsIoRegion.AslrOffset;
-            tlsIoRegion.End = tlsIoRegion.Start + tlsIoRegion.Size;
 
             SortRegion(ref aliasRegion, ref heapRegion, true);
 
@@ -439,9 +440,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
             ulong endAddr = address + size;
 
-            ulong addrSpacePagesCount = (AddrSpaceEnd - AddrSpaceStart) / PageSize;
+            ulong addrSpacePagesCount = (AddressSpaceEnd - AddressSpaceStart) / PageSize;
 
-            if (AddrSpaceStart > address)
+            if (AddressSpaceStart > address)
             {
                 return KernelResult.InvalidMemState;
             }
@@ -451,7 +452,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 return KernelResult.InvalidMemState;
             }
 
-            if (endAddr - 1 > AddrSpaceEnd - 1)
+            if (endAddr - 1 > AddressSpaceEnd - 1)
             {
                 return KernelResult.InvalidMemState;
             }
@@ -984,8 +985,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
         public KMemoryInfo QueryMemory(ulong address)
         {
-            if (address >= AddrSpaceStart &&
-                address < AddrSpaceEnd)
+            if (address >= AddressSpaceStart &&
+                address < AddressSpaceEnd)
             {
                 lock (_blockManager)
                 {
@@ -995,8 +996,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             else
             {
                 return new KMemoryInfo(
-                    AddrSpaceEnd,
-                    ~AddrSpaceEnd + 1,
+                    AddressSpaceEnd,
+                    ~AddressSpaceEnd + 1,
                     MemoryState.Reserved,
                     KMemoryPermission.None,
                     MemoryAttribute.None,
@@ -1558,14 +1559,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             MemoryAttribute attributeExpected,
             bool toServer)
         {
-            if (AddrSpaceStart > clientAddress)
+            if (AddressSpaceStart > clientAddress)
             {
                 return KernelResult.InvalidMemState;
             }
 
             ulong srcEndAddr = clientAddress + size;
 
-            if (srcEndAddr <= clientAddress || srcEndAddr - 1 > AddrSpaceEnd - 1)
+            if (srcEndAddr <= clientAddress || srcEndAddr - 1 > AddressSpaceEnd - 1)
             {
                 return KernelResult.InvalidMemState;
             }
@@ -1689,14 +1690,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         {
             blocksNeeded = 0;
 
-            if (AddrSpaceStart > address)
+            if (AddressSpaceStart > address)
             {
                 return KernelResult.InvalidMemState;
             }
 
             ulong endAddr = address + size;
 
-            if (endAddr <= address || endAddr - 1 > AddrSpaceEnd - 1)
+            if (endAddr <= address || endAddr - 1 > AddressSpaceEnd - 1)
             {
                 return KernelResult.InvalidMemState;
             }
@@ -2029,14 +2030,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
         public Result UnmapNoAttributeIfStateEquals(ulong address, ulong size, MemoryState state)
         {
-            if (AddrSpaceStart > address)
+            if (AddressSpaceStart > address)
             {
                 return KernelResult.InvalidMemState;
             }
 
             ulong endAddr = address + size;
 
-            if (endAddr <= address || endAddr - 1 > AddrSpaceEnd - 1)
+            if (endAddr <= address || endAddr - 1 > AddressSpaceEnd - 1)
             {
                 return KernelResult.InvalidMemState;
             }
@@ -2810,7 +2811,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 case MemoryState.ProcessMemory:
                 case MemoryState.CodeReadOnly:
                 case MemoryState.CodeWritable:
-                    return GetAddrSpaceBaseAddr();
+                    return AslrRegionStart;
 
                 case MemoryState.Heap:
                     return HeapRegionStart;
@@ -2824,7 +2825,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     return StackRegionStart;
 
                 case MemoryState.KernelStack:
-                    return AddrSpaceStart;
+                    return AddressSpaceStart;
             }
 
             throw new ArgumentException($"Invalid state value \"{state}\".");
@@ -2849,7 +2850,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 case MemoryState.ProcessMemory:
                 case MemoryState.CodeReadOnly:
                 case MemoryState.CodeWritable:
-                    return GetAddrSpaceSize();
+                    return AslrRegionEnd - AslrRegionStart;
 
                 case MemoryState.Heap:
                     return HeapRegionEnd - HeapRegionStart;
@@ -2863,22 +2864,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     return StackRegionEnd - StackRegionStart;
 
                 case MemoryState.KernelStack:
-                    return AddrSpaceEnd - AddrSpaceStart;
+                    return AddressSpaceEnd - AddressSpaceStart;
             }
 
             throw new ArgumentException($"Invalid state value \"{state}\".");
         }
 
-        public ulong GetAddrSpaceBaseAddr()
-        {
-            return AslrRegionStart;
-        }
-
-        public ulong GetAddrSpaceSize()
-        {
-            return AslrRegionEnd - AslrRegionStart;
-        }
-
         private static ulong GetDramAddressFromPa(ulong pa)
         {
             return pa - DramMemoryMap.DramBase;
@@ -2904,12 +2895,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
         public bool IsInvalidRegion(ulong address, ulong size)
         {
-            return address + size - 1 > GetAddrSpaceBaseAddr() + GetAddrSpaceSize() - 1;
+            return address + size - 1 > AslrRegionEnd - 1;
         }
 
         public bool InsideAddrSpace(ulong address, ulong size)
         {
-            return AddrSpaceStart <= address && address + size - 1 <= AddrSpaceEnd - 1;
+            return AddressSpaceStart <= address && address + size - 1 <= AddressSpaceEnd - 1;
         }
 
         public bool InsideAliasRegion(ulong address, ulong size)
@@ -2934,7 +2925,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
         public bool OutsideAddrSpace(ulong address, ulong size)
         {
-            return AddrSpaceStart > address || address + size - 1 > AddrSpaceEnd - 1;
+            return AddressSpaceStart > address || address + size - 1 > AddressSpaceEnd - 1;
         }
 
         public bool OutsideStackRegion(ulong address, ulong size)

src/Ryujinx.HLE/HOS/Kernel/Process/IProcessContext.cs

@@ -7,6 +7,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
     interface IProcessContext : IDisposable
     {
         IVirtualMemoryManager AddressSpace { get; }
+        ulong ReservedSize { get; }
 
         ulong AddressSpaceSize { get; }
 

src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs

@@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             // TODO: Remove once we no longer need to initialize it externally.
             HandleTable = new KHandleTable();
 
-            _threads = [];
+            _threads = new LinkedList<KThread>();
 
             Debugger = new HleProcessDebugger(this);
         }
@@ -135,7 +135,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
             InitializeMemoryManager(creationInfo.Flags);
 
-            ulong codeAddress = creationInfo.CodeAddress;
+            ulong codeAddress = creationInfo.CodeAddress + Context.ReservedSize;
 
             ulong codeSize = (ulong)creationInfo.CodePagesCount * KPageTableBase.PageSize;
 
@@ -149,6 +149,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 memRegion,
                 codeAddress,
                 codeSize,
+                Context.ReservedSize,
                 slabManager);
 
             if (result != Result.Success)
@@ -184,7 +185,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             KResourceLimit resourceLimit,
             MemoryRegion memRegion,
             IProcessContextFactory contextFactory,
-            ThreadStart customThreadStart = null)
+            ThreadStart customThreadStart = null,
+            ulong entrypointOffset = 0UL)
         {
             ResourceLimit = resourceLimit;
             _memRegion = memRegion;
@@ -238,7 +240,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
             InitializeMemoryManager(creationInfo.Flags);
 
-            ulong codeAddress = creationInfo.CodeAddress;
+            ulong codeAddress = creationInfo.CodeAddress + Context.ReservedSize;
 
             ulong codeSize = codePagesCount * KPageTableBase.PageSize;
 
@@ -248,6 +250,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 memRegion,
                 codeAddress,
                 codeSize,
+                Context.ReservedSize,
                 slabManager);
 
             if (result != Result.Success)
@@ -293,6 +296,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 CleanUpForError();
             }
 
+            _entrypoint += entrypointOffset;
+
             return result;
         }
 
@@ -337,10 +342,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
             Flags = creationInfo.Flags;
             TitleId = creationInfo.TitleId;
-            _entrypoint = creationInfo.CodeAddress;
+            _entrypoint = creationInfo.CodeAddress + Context.ReservedSize;
             _imageSize = (ulong)creationInfo.CodePagesCount * KPageTableBase.PageSize;
 
-            switch (Flags & ProcessCreationFlags.AddressSpaceMask)
+            // 19.0.0+ sets all regions to same size
+            _memoryUsageCapacity = MemoryManager.HeapRegionEnd - MemoryManager.HeapRegionStart;
+            /*switch (Flags & ProcessCreationFlags.AddressSpaceMask)
             {
                 case ProcessCreationFlags.AddressSpace32Bit:
                 case ProcessCreationFlags.AddressSpace64BitDeprecated:
@@ -357,7 +364,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                     break;
                 default:
                     throw new InvalidOperationException($"Invalid MMU flags value 0x{Flags:x2}.");
-            }
+            }*/
 
             GenerateRandomEntropy();
 
@@ -535,7 +542,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 {
                     throw new InvalidOperationException("Trying to start a process with an invalid state!");
                 }
-
+                // TODO: after 19.0.0+ alignment is not needed
                 ulong stackSizeRounded = BitUtils.AlignUp<ulong>(stackSize, KPageTableBase.PageSize);
 
                 ulong neededSize = stackSizeRounded + _imageSize;

src/Ryujinx.HLE/HOS/Kernel/Process/ProcessContext.cs

@@ -7,6 +7,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
     class ProcessContext : IProcessContext
     {
         public IVirtualMemoryManager AddressSpace { get; }
+        public ulong ReservedSize => 0UL;
 
         public ulong AddressSpaceSize { get; }
 

src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs

@@ -1988,10 +1988,10 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                                 break;
 
                             case InfoType.AslrRegionAddress:
-                                value = process.MemoryManager.GetAddrSpaceBaseAddr();
+                                value = process.MemoryManager.AslrRegionStart;
                                 break;
                             case InfoType.AslrRegionSize:
-                                value = process.MemoryManager.GetAddrSpaceSize();
+                                value = process.MemoryManager.AslrRegionEnd - process.MemoryManager.AslrRegionStart;
                                 break;
 
                             case InfoType.StackRegionAddress:
@@ -2683,7 +2683,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                     return KernelResult.InvalidCombination;
                 }
 
-                if ((uint)preferredCore > KScheduler.CpuCoresCount - 1)
+                if ((uint)preferredCore > 3)
                 {
                     if ((preferredCore | 2) != -1)
                     {
@@ -2813,7 +2813,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
             {
                 KProcess currentProcess = KernelStatic.GetCurrentProcess();
 
-                if (currentProcess.MemoryManager.AddrSpaceStart > handlesPtr)
+                if (currentProcess.MemoryManager.AddressSpaceStart > handlesPtr)
                 {
                     return KernelResult.UserCopyFailed;
                 }
@@ -2825,7 +2825,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                     return KernelResult.UserCopyFailed;
                 }
 
-                if (handlesPtr + (ulong)handlesSize - 1 > currentProcess.MemoryManager.AddrSpaceEnd - 1)
+                if (handlesPtr + (ulong)handlesSize - 1 > currentProcess.MemoryManager.AddressSpaceEnd - 1)
                 {
                     return KernelResult.UserCopyFailed;
                 }

src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountManager.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
             {
                 byte[] defaultUserImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/DefaultUserImage.jpg");
 
-                AddUser("RyuPlayer", defaultUserImage, DefaultUserId);
+                AddUser("KenPlayer", defaultUserImage, DefaultUserId);
 
                 OpenUser(DefaultUserId);
             }

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs

@@ -130,7 +130,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
             {
                 try
                 {
-                    _portMapping = new Mapping(Protocol.Tcp, PrivatePort, _publicPort, PortLeaseLength, "Ryujinx Local Multiplayer");
+                    _portMapping = new Mapping(Protocol.Tcp, PrivatePort, _publicPort, PortLeaseLength, "Kenji-NX Local Multiplayer");
 
                     await device.CreatePortMapAsync(_portMapping);
 
@@ -364,7 +364,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
             try
             {
-                Task delete = _natDevice?.DeletePortMapAsync(new Mapping(Protocol.Tcp, PrivatePort, _publicPort, 60, "Ryujinx Local Multiplayer"));
+                Task delete = _natDevice?.DeletePortMapAsync(new Mapping(Protocol.Tcp, PrivatePort, _publicPort, 60, "Kenji-NX Local Multiplayer"));
 
                 // Just absorb any exceptions.
                 delete?.ContinueWith((task) => { });

src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs

@@ -69,7 +69,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
         public static RegisterInfo GetRegisterInfo(ITickSource tickSource, string amiiboId, string userName)
         {
             VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId);
-            string nickname = amiiboFile.NickName ?? "Ryujinx";
+            string nickname = amiiboFile.NickName ?? "Kenji-NX";
             if (NickName != string.Empty)
             {
                 nickname = NickName;

src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs

@@ -25,7 +25,10 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
                 IsAnyInternetRequestAccepted = true, // NOTE: Why not accept any internet request?
             };
 
-            NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler;
+            if (!Ryujinx.Common.PlatformInfo.IsBionic)
+            {
+                NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler;
+            }
 
             GeneralServiceManager.Add(_generalServiceDetail);
         }
@@ -84,7 +87,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
             networkProfile.IpSettingData.IpAddressSetting = new IpAddressSetting(interfaceProperties, unicastAddress);
             networkProfile.IpSettingData.DnsSetting = new DnsSetting(interfaceProperties);
 
-            "RyujinxNetwork"u8.CopyTo(networkProfile.Name.AsSpan());
+            "KenjinxNetwork"u8.CopyTo(networkProfile.Name.AsSpan());
 
             context.Memory.Write(networkProfileDataPosition, networkProfile);
 
@@ -196,7 +199,10 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
         {
             if (isDisposing)
             {
-                NetworkChange.NetworkAddressChanged -= LocalInterfaceCacheHandler;
+                if (!Ryujinx.Common.PlatformInfo.IsBionic)
+                {
+                    NetworkChange.NetworkAddressChanged -= LocalInterfaceCacheHandler;
+                }
 
                 GeneralServiceManager.Remove(_generalServiceDetail.ClientId);
             }

src/Ryujinx.HLE/HOS/Services/Pm/IBootModeInterface.cs

@@ -1,8 +1,19 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.Pm.Types;
+
 namespace Ryujinx.HLE.HOS.Services.Pm
 {
     [Service("pm:bm")]
     class IBootModeInterface : IpcService
     {
         public IBootModeInterface(ServiceCtx context) { }
+
+        [CommandCmif(0)]
+        // GetBootMode() -> u32
+        public ResultCode GetBootMode(ServiceCtx context)
+        {
+            context.ResponseData.Write((uint)BootMode.Normal);
+            return ResultCode.Success;
+        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Pm/Types/BootMode.cs

@@ -0,0 +1,9 @@
+namespace Ryujinx.HLE.HOS.Services.Pm.Types
+{
+    enum BootMode : uint
+    {
+        Normal = 0,
+        Maintenance = 1,
+        SafeMode = 2,
+    }
+}

src/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs

@@ -270,7 +270,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro
 
             int retryCount;
 
-            ulong addressSpacePageLimit = (memMgr.GetAddrSpaceSize() - size) >> 12;
+            ulong addressSpacePageLimit = ((memMgr.AslrRegionEnd - memMgr.AslrRegionStart) - size) >> 12;
 
             for (retryCount = 0; retryCount < MaxMapRetries; retryCount++)
             {
@@ -278,7 +278,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro
                 {
                     ulong randomOffset = (ulong)(uint)Random.Shared.Next(0, (int)addressSpacePageLimit) << 12;
 
-                    targetAddress = memMgr.GetAddrSpaceBaseAddr() + randomOffset;
+                    targetAddress = memMgr.AslrRegionStart + randomOffset;
 
                     if (memMgr.InsideAddrSpace(targetAddress, size) && !memMgr.InsideHeapRegion(targetAddress, size) && !memMgr.InsideAliasRegion(targetAddress, size))
                     {

src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs

@@ -244,6 +244,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
             return ResultCode.Success;
         }
 
+        [CommandCmif(68)]
+        // GetSerialNumber() -> buffer<nn::settings::system::SerialNumber, 0x16>
+        public ResultCode GetSerialNumber(ServiceCtx context)
+        {
+            context.ResponseData.Write(Encoding.ASCII.GetBytes("RYU00000000000"));
+
+            return ResultCode.Success;
+        }
+
         [CommandCmif(77)]
         // GetDeviceNickName() -> buffer<nn::settings::system::DeviceNickName, 0x16>
         public ResultCode GetDeviceNickName(ServiceCtx context)

src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs

@@ -51,6 +51,14 @@ namespace Ryujinx.HLE.HOS.Services.Spl
 
             context.ResponseData.Write(configValue);
 
+            if(Ryujinx.Common.PlatformInfo.IsBionic)
+            {
+                if (result == SmcResult.Success)
+                {
+                    return ResultCode.Success;
+                }
+            }
+
             return (ResultCode)((int)result << 9) | ResultCode.ModuleId;
         }
 

src/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs

@@ -46,7 +46,7 @@ namespace Ryujinx.HLE.HOS.SystemState
         {
             // TODO: Let user specify fields.
             DesiredKeyboardLayout = (long)KeyboardLayout.Default;
-            DeviceNickName = "Ryujinx's Switch";
+            DeviceNickName = "Kenji-NX's Switch";
         }
 
         public void SetLanguage(SystemLanguage language)