daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2025-06-28 13:30:47 -07:00
Code Issues 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

11
Ryujinx.Cpu/MemoryHelper.cs
View File

@ -1,4 +1,5 @@
using System;
using Ryujinx.Memory;
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
@ -7,7 +8,7 @@ namespace Ryujinx.Cpu
{
public static class MemoryHelper
{
public static void FillWithZeros(MemoryManager memory, long position, int size)
public static void FillWithZeros(IVirtualMemoryManager memory, long position, int size)
{
int size8 = size & ~(8 - 1);
@ -22,7 +23,7 @@ namespace Ryujinx.Cpu
}
}
public unsafe static T Read<T>(MemoryManager memory, long position) where T : struct
public unsafe static T Read<T>(IVirtualMemoryManager memory, long position) where T : struct
{
long size = Marshal.SizeOf<T>();
@ -36,7 +37,7 @@ namespace Ryujinx.Cpu
}
}
public unsafe static void Write<T>(MemoryManager memory, long position, T value) where T : struct
public unsafe static void Write<T>(IVirtualMemoryManager memory, long position, T value) where T : struct
{
long size = Marshal.SizeOf<T>();
@ -50,7 +51,7 @@ namespace Ryujinx.Cpu
memory.Write((ulong)position, data);
}
public static string ReadAsciiString(MemoryManager memory, long position, long maxSize = -1)
public static string ReadAsciiString(IVirtualMemoryManager memory, long position, long maxSize = -1)
{
using (MemoryStream ms = new MemoryStream())
{

7
Ryujinx.Cpu/MemoryManager.cs
View File

@ -13,7 +13,7 @@ namespace Ryujinx.Cpu
/// <summary>
/// Represents a CPU memory manager.
/// </summary>
public sealed class MemoryManager : IMemoryManager, IDisposable, IVirtualMemoryManager
public sealed class MemoryManager : IMemoryManager, IVirtualMemoryManager, IDisposable
{
public const int PageBits = 12;
public const int PageSize = 1 << PageBits;
@ -468,6 +468,11 @@ namespace Ryujinx.Cpu
/// <returns>True if the entire range is mapped, false otherwise</returns>
public bool IsRangeMapped(ulong va, ulong size)
{
if (size == 0UL)
{
return true;
}
ulong endVa = (va + size + PageMask) & ~(ulong)PageMask;
va &= ~(ulong)PageMask;

19
Ryujinx.Cpu/MemoryNotContiguousException.cs
View File

@ -1,19 +0,0 @@
using System;
namespace Ryujinx.Cpu
{
class MemoryNotContiguousException : Exception
{
public MemoryNotContiguousException() : base("The specified memory region is not contiguous.")
{
}
public MemoryNotContiguousException(string message) : base(message)
{
}
public MemoryNotContiguousException(string message, Exception innerException) : base(message, innerException)
{
}
}
}

29
Ryujinx.Cpu/WritableRegion.cs
View File

@ -1,29 +0,0 @@
using System;
namespace Ryujinx.Cpu
{
public sealed class WritableRegion : IDisposable
{
private readonly MemoryManager _mm;
private readonly ulong _va;
private bool NeedsWriteback => _mm != null;
public Memory<byte> Memory { get; }
internal WritableRegion(MemoryManager mm, ulong va, Memory<byte> memory)
{
_mm = mm;
_va = va;
Memory = memory;
}
public void Dispose()
{
if (NeedsWriteback)
{
_mm.Write(_va, Memory.Span);
}
}
}
}