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/MemoryManagement.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/MemoryManagement.cs')
| -rw-r--r-- | Ryujinx.Memory/MemoryManagement.cs | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/Ryujinx.Memory/MemoryManagement.cs b/Ryujinx.Memory/MemoryManagement.cs index 77a8a1ef..7c042eba 100644 --- a/Ryujinx.Memory/MemoryManagement.cs +++ b/Ryujinx.Memory/MemoryManagement.cs @@ -20,11 +20,11 @@ namespace Ryujinx.Memory } } - public static IntPtr Reserve(ulong size, bool viewCompatible, bool force4KBMap) + public static IntPtr Reserve(ulong size, bool viewCompatible) { if (OperatingSystem.IsWindows()) { - return MemoryManagementWindows.Reserve((IntPtr)size, viewCompatible, force4KBMap); + return MemoryManagementWindows.Reserve((IntPtr)size, viewCompatible); } else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { @@ -72,14 +72,7 @@ namespace Ryujinx.Memory { if (OperatingSystem.IsWindows()) { - if (owner.ForceWindows4KBView) - { - MemoryManagementWindows.MapView4KB(sharedMemory, srcOffset, address, (IntPtr)size); - } - else - { - MemoryManagementWindows.MapView(sharedMemory, srcOffset, address, (IntPtr)size, owner); - } + MemoryManagementWindows.MapView(sharedMemory, srcOffset, address, (IntPtr)size, owner); } else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { @@ -95,14 +88,7 @@ namespace Ryujinx.Memory { if (OperatingSystem.IsWindows()) { - if (owner.ForceWindows4KBView) - { - MemoryManagementWindows.UnmapView4KB(address, (IntPtr)size); - } - else - { - MemoryManagementWindows.UnmapView(sharedMemory, address, (IntPtr)size, owner); - } + MemoryManagementWindows.UnmapView(sharedMemory, address, (IntPtr)size, owner); } else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { @@ -114,20 +100,13 @@ namespace Ryujinx.Memory } } - public static void Reprotect(IntPtr address, ulong size, MemoryPermission permission, bool forView, bool force4KBMap, bool throwOnFail) + public static void Reprotect(IntPtr address, ulong size, MemoryPermission permission, bool forView, bool throwOnFail) { bool result; if (OperatingSystem.IsWindows()) { - if (forView && force4KBMap) - { - result = MemoryManagementWindows.Reprotect4KB(address, (IntPtr)size, permission, forView); - } - else - { - result = MemoryManagementWindows.Reprotect(address, (IntPtr)size, permission, forView); - } + result = MemoryManagementWindows.Reprotect(address, (IntPtr)size, permission, forView); } else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { @@ -144,11 +123,11 @@ namespace Ryujinx.Memory } } - public static bool Free(IntPtr address, ulong size, bool force4KBMap) + public static bool Free(IntPtr address, ulong size) { if (OperatingSystem.IsWindows()) { - return MemoryManagementWindows.Free(address, (IntPtr)size, force4KBMap); + return MemoryManagementWindows.Free(address, (IntPtr)size); } else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { |