diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2022-07-30 00:16:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 19:16:29 -0300 |
| commit | 14ce9e15672d03cb6fc067316f90d81471398ebc (patch) | |
| tree | 39befb3c65a2548fe803bf746545de3fd8851ffd /Ryujinx.Memory/MemoryBlock.cs | |
| parent | 952d013c67a1809fae3b3c7ade9a0757598d9e18 (diff) | |
Move partial unmap handler to the native signal handler (#3437)1.1.199
* Initial commit with a lot of testing stuff.
* Partial Unmap Cleanup Part 1
* Fix some minor issues, hopefully windows tests.
* Disable partial unmap tests on macos for now
Weird issue.
* Goodbye magic number
* Add COMPlus_EnableAlternateStackCheck for tests
`COMPlus_EnableAlternateStackCheck` is needed for NullReferenceException handling to work on linux after registering the signal handler, due to how dotnet registers its own signal handler.
* Address some feedback
* Force retry when memory is mapped in memory tracking
This case existed before, but returning `false` no longer retries, so it would crash immediately after unprotecting the memory... Now, we return `true` to deliberately retry.
This case existed before (was just broken by this change) and I don't really want to look into fixing the issue right now. Technically, this means that on guest code partial unmaps will retry _due to this_ rather than hitting the handler. I don't expect this to cause any issues.
This should fix random crashes in Xenoblade Chronicles 2.
* Use IsRangeMapped
* Suppress MockMemoryManager.UnmapEvent warning
This event is not signalled by the mock memory manager.
* Remove 4kb mapping
Diffstat (limited to 'Ryujinx.Memory/MemoryBlock.cs')
| -rw-r--r-- | Ryujinx.Memory/MemoryBlock.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Ryujinx.Memory/MemoryBlock.cs b/Ryujinx.Memory/MemoryBlock.cs index b68a1000..79a5cfe7 100644 --- a/Ryujinx.Memory/MemoryBlock.cs +++ b/Ryujinx.Memory/MemoryBlock.cs @@ -13,14 +13,11 @@ namespace Ryujinx.Memory private readonly bool _usesSharedMemory; private readonly bool _isMirror; private readonly bool _viewCompatible; - private readonly bool _forceWindows4KBView; private IntPtr _sharedMemory; private IntPtr _pointer; private ConcurrentDictionary<MemoryBlock, byte> _viewStorages; private int _viewCount; - internal bool ForceWindows4KBView => _forceWindows4KBView; - /// <summary> /// Pointer to the memory block data. /// </summary> @@ -49,8 +46,7 @@ namespace Ryujinx.Memory else if (flags.HasFlag(MemoryAllocationFlags.Reserve)) { _viewCompatible = flags.HasFlag(MemoryAllocationFlags.ViewCompatible); - _forceWindows4KBView = flags.HasFlag(MemoryAllocationFlags.ForceWindows4KBViewMapping); - _pointer = MemoryManagement.Reserve(size, _viewCompatible, _forceWindows4KBView); + _pointer = MemoryManagement.Reserve(size, _viewCompatible); } else { @@ -173,7 +169,7 @@ namespace Ryujinx.Memory /// <exception cref="MemoryProtectionException">Throw when <paramref name="permission"/> is invalid</exception> public void Reprotect(ulong offset, ulong size, MemoryPermission permission, bool throwOnFail = true) { - MemoryManagement.Reprotect(GetPointerInternal(offset, size), size, permission, _viewCompatible, _forceWindows4KBView, throwOnFail); + MemoryManagement.Reprotect(GetPointerInternal(offset, size), size, permission, _viewCompatible, throwOnFail); } /// <summary> @@ -406,7 +402,7 @@ namespace Ryujinx.Memory } else { - MemoryManagement.Free(ptr, Size, _forceWindows4KBView); + MemoryManagement.Free(ptr, Size); } foreach (MemoryBlock viewStorage in _viewStorages.Keys) |