diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-12-01 20:23:43 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 00:23:43 +0100 |
| commit | cf6cd714884c41e9550757e364c2f4f5b04fc7f3 (patch) | |
| tree | bea748b4d1a350e5b8075d63ec9d39d49693829d /Ryujinx.Cpu | |
| parent | 461c24092ae6e148d896c18aa3e86220c89981f8 (diff) | |
IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel (#1458)
* 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>
Diffstat (limited to 'Ryujinx.Cpu')
| -rw-r--r-- | Ryujinx.Cpu/MemoryHelper.cs | 11 | ||||
| -rw-r--r-- | Ryujinx.Cpu/MemoryManager.cs | 7 | ||||
| -rw-r--r-- | Ryujinx.Cpu/MemoryNotContiguousException.cs | 19 | ||||
| -rw-r--r-- | Ryujinx.Cpu/WritableRegion.cs | 29 |
4 files changed, 12 insertions, 54 deletions
diff --git a/Ryujinx.Cpu/MemoryHelper.cs b/Ryujinx.Cpu/MemoryHelper.cs index 5ba5ef38..8ef4bc66 100644 --- a/Ryujinx.Cpu/MemoryHelper.cs +++ b/Ryujinx.Cpu/MemoryHelper.cs @@ -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()) { diff --git a/Ryujinx.Cpu/MemoryManager.cs b/Ryujinx.Cpu/MemoryManager.cs index 3fa08fe7..36ae9b32 100644 --- a/Ryujinx.Cpu/MemoryManager.cs +++ b/Ryujinx.Cpu/MemoryManager.cs @@ -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; diff --git a/Ryujinx.Cpu/MemoryNotContiguousException.cs b/Ryujinx.Cpu/MemoryNotContiguousException.cs deleted file mode 100644 index d7c827cc..00000000 --- a/Ryujinx.Cpu/MemoryNotContiguousException.cs +++ /dev/null @@ -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) - { - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Cpu/WritableRegion.cs b/Ryujinx.Cpu/WritableRegion.cs deleted file mode 100644 index 5ea0a2d8..00000000 --- a/Ryujinx.Cpu/WritableRegion.cs +++ /dev/null @@ -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); - } - } - } -} |