Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-04 11:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Fix numerous NullReferenceExceptions, InvalidOperationExceptions

Browse Source
This commit is contained in:
KeatonTheBot
2025-06-18 02:25:06 -05:00
parent a90db3464d
commit d2a532f971
90 changed files with 667 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs
+4 -1
View File
@@ -62,7 +62,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
if (list.Count != 0)
{
session = list.First.Value;
if (list.First != null)
{
session = list.First.Value;
}
list.RemoveFirst();
}
src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs
+37 -31
View File
@@ -1369,44 +1369,50 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
LinkedListNode<KPageNode> pageListNode = pageList.Nodes.First;
KPageNode pageNode = pageListNode.Value;
ulong srcPa = pageNode.Address;
ulong srcPaPages = pageNode.PagesCount;
foreach (KMemoryInfo info in IterateOverRange(address, endAddr))
if (pageListNode != null)
{
if (info.State != MemoryState.Unmapped)
KPageNode pageNode = pageListNode.Value;
ulong srcPa = pageNode.Address;
ulong srcPaPages = pageNode.PagesCount;
foreach (KMemoryInfo info in IterateOverRange(address, endAddr))
{
continue;
}
ulong blockSize = GetSizeInRange(info, address, endAddr);
ulong dstVaPages = blockSize / PageSize;
ulong dstVa = GetAddrInRange(info, address);
while (dstVaPages > 0)
{
if (srcPaPages == 0)
if (info.State != MemoryState.Unmapped)
{
pageListNode = pageListNode.Next;
pageNode = pageListNode.Value;
srcPa = pageNode.Address;
srcPaPages = pageNode.PagesCount;
continue;
}
ulong currentPagesCount = Math.Min(srcPaPages, dstVaPages);
ulong blockSize = GetSizeInRange(info, address, endAddr);
MapPages(dstVa, currentPagesCount, srcPa, KMemoryPermission.ReadAndWrite, MemoryMapFlags.Private);
ulong dstVaPages = blockSize / PageSize;
dstVa += currentPagesCount * PageSize;
srcPa += currentPagesCount * PageSize;
srcPaPages -= currentPagesCount;
dstVaPages -= currentPagesCount;
ulong dstVa = GetAddrInRange(info, address);
while (dstVaPages > 0)
{
if (srcPaPages == 0)
{
pageListNode = pageListNode?.Next;
if (pageListNode != null)
{
pageNode = pageListNode.Value;
}
srcPa = pageNode.Address;
srcPaPages = pageNode.PagesCount;
}
ulong currentPagesCount = Math.Min(srcPaPages, dstVaPages);
MapPages(dstVa, currentPagesCount, srcPa, KMemoryPermission.ReadAndWrite, MemoryMapFlags.Private);
dstVa += currentPagesCount * PageSize;
srcPa += currentPagesCount * PageSize;
srcPaPages -= currentPagesCount;
dstVaPages -= currentPagesCount;
}
}
}
src/Ryujinx.HLE/HOS/Kernel/Memory/SharedMemoryStorage.cs
+5 -2
View File
@@ -34,8 +34,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
{
if (_pageList.Nodes.Count == 1)
{
ulong address = _pageList.Nodes.First.Value.Address - DramMemoryMap.DramBase;
return ref _context.Memory.GetRef<T>(address + offset);
if (_pageList.Nodes.First != null)
{
ulong address = _pageList.Nodes.First.Value.Address - DramMemoryMap.DramBase;
return ref _context.Memory.GetRef<T>(address + offset);
}
}
throw new NotImplementedException("Non-contiguous shared memory is not yet supported.");
src/Ryujinx.HLE/HOS/Kernel/Threading/KPriorityQueue.cs
+1 -1
View File
@@ -253,7 +253,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
thread.SiblingsPerCore[core] = queue.AddLast(thread);
return queue.First.Value;
return queue.First?.Value;
}
public void Unschedule(int prio, int core, KThread thread)
src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
+1 -1
View File
@@ -1302,7 +1302,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
{
Owner?.RemoveThread(this);
if (_tlsAddress != 0 && Owner.FreeThreadLocalStorage(_tlsAddress) != Result.Success)
if (_tlsAddress != 0 && Owner?.FreeThreadLocalStorage(_tlsAddress) != Result.Success)
{
throw new InvalidOperationException("Unexpected failure freeing thread local storage.");
}