vleeuwenmenno/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel (#1458)

Browse Source 
* IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel

* Fix for applet transfer memory + some nits

* Keep handles if possible to avoid server handle table exhaustion

* Fix IPC ZeroFill bug

* am: Correctly implement CreateManagedDisplayLayer and implement CreateManagedDisplaySeparableLayer

CreateManagedDisplaySeparableLayer is requires since 10.x+ when appletResourceUserId != 0

* Make it exit properly

* Make ServiceNotImplementedException show the full message again

* Allow yielding execution to avoid starving other threads

* Only wait if active

* Merge IVirtualMemoryManager and IAddressSpaceManager

* Fix Ro loading data from the wrong process

Co-authored-by: Thog <me@thog.eu>
This commit is contained in:
gdkchan
2020-12-01 20:23:43 -03:00
committed by GitHub
parent 461c24092a
commit cf6cd71488
115 changed files with 2356 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
View File

@ -84,6 +84,11 @@ namespace Ryujinx.HLE.HOS.Ipc
long pad0 = GetPadSize16(reader.BaseStream.Position + cmdPtr);
if (rawDataSize != 0)
{
rawDataSize -= (int)pad0;
}
reader.BaseStream.Seek(pad0, SeekOrigin.Current);
int recvListCount = recvListFlags - 2;
@ -107,7 +112,7 @@ namespace Ryujinx.HLE.HOS.Ipc
}
}
public byte[] GetBytes(long cmdPtr)
public byte[] GetBytes(long cmdPtr, ulong recvListAddr)
{
using (MemoryStream ms = new MemoryStream())
{
@ -131,7 +136,11 @@ namespace Ryujinx.HLE.HOS.Ipc
int dataLength = RawData?.Length ?? 0;
int pad0 = (int)GetPadSize16(cmdPtr + 8 + handleData.Length);
dataLength = (dataLength + 3) & ~3;
int rawLength = dataLength;
int pad0 = (int)GetPadSize16(cmdPtr + 8 + handleData.Length + PtrBuff.Count * 8);
// Apparently, padding after Raw Data is 16 bytes, however when there is
// padding before Raw Data too, we need to subtract the size of this padding.
@ -140,7 +149,7 @@ namespace Ryujinx.HLE.HOS.Ipc
dataLength = (dataLength + pad0 + pad1) / 4;
word1 = dataLength & 0x3ff;
word1 = (dataLength & 0x3ff) | (2 << 10);
if (HandleDesc != null)
{
@ -151,14 +160,22 @@ namespace Ryujinx.HLE.HOS.Ipc
writer.Write(word1);
writer.Write(handleData);
for (int index = 0; index < PtrBuff.Count; index++)
{
writer.Write(PtrBuff[index].GetWord0());
writer.Write(PtrBuff[index].GetWord1());
}
ms.Seek(pad0, SeekOrigin.Current);
if (RawData != null)
{
writer.Write(RawData);
ms.Seek(rawLength - RawData.Length, SeekOrigin.Current);
}
writer.Write(new byte[pad1]);
writer.Write(recvListAddr);
return ms.ToArray();
}

27
Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
View File

@ -8,6 +8,13 @@ namespace Ryujinx.HLE.HOS.Ipc
public int Index { get; private set; }
public long Size { get; private set; }
public IpcPtrBuffDesc(long position, int index, long size)
{
Position = position;
Index = index;
Size = size;
}
public IpcPtrBuffDesc(BinaryReader reader)
{
long word0 = reader.ReadUInt32();
@ -22,5 +29,25 @@ namespace Ryujinx.HLE.HOS.Ipc
Size = (ushort)(word0 >> 16);
}
public uint GetWord0()
{
uint word0;
word0 = (uint)((Position & 0x0f00000000) >> 20);
word0 |= (uint)((Position & 0x7000000000) >> 30);
word0 |= (uint)(Index & 0x03f) << 0;
word0 |= (uint)(Index & 0x1c0) << 3;
word0 |= (uint)Size << 16;
return word0;
}
public uint GetWord1()
{
return (uint)Position;
}
}
}

6
Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
View File

@ -7,6 +7,12 @@ namespace Ryujinx.HLE.HOS.Ipc
public long Position { get; private set; }
public long Size { get; private set; }
public IpcRecvListBuffDesc(long position, long size)
{
Position = position;
Size = size;
}
public IpcRecvListBuffDesc(BinaryReader reader)
{
long value = reader.ReadInt64();