From a8862fc7cffbd7a41e599d9be399188ff7f0d3f4 Mon Sep 17 00:00:00 2001
From: Gabriel A <gab.dark.100@gmail.com>
Date: Wed, 31 Jul 2024 22:37:52 -0300
Subject: [PATCH] Consolidate IsInvalid check

---
 src/Ryujinx.Memory/Range/IMultiRangeItem.cs |  2 +-
 src/Ryujinx.Memory/Range/MemoryRange.cs     | 11 +++++++++++
 src/Ryujinx.Memory/Range/MultiRangeList.cs  | 17 +++--------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Ryujinx.Memory/Range/IMultiRangeItem.cs b/src/Ryujinx.Memory/Range/IMultiRangeItem.cs
index 121d142953..bc8af4f81f 100644
--- a/src/Ryujinx.Memory/Range/IMultiRangeItem.cs
+++ b/src/Ryujinx.Memory/Range/IMultiRangeItem.cs
@@ -12,7 +12,7 @@ namespace Ryujinx.Memory.Range
                 {
                     MemoryRange subRange = Range.GetSubRange(index);
 
-                    if (subRange.Address != ulong.MaxValue)
+                    if (!MemoryRange.IsInvalid(ref subRange))
                     {
                         return subRange.Address;
                     }
diff --git a/src/Ryujinx.Memory/Range/MemoryRange.cs b/src/Ryujinx.Memory/Range/MemoryRange.cs
index 46aca9ba03..e0184c90a1 100644
--- a/src/Ryujinx.Memory/Range/MemoryRange.cs
+++ b/src/Ryujinx.Memory/Range/MemoryRange.cs
@@ -58,6 +58,17 @@ namespace Ryujinx.Memory.Range
             return thisAddress < otherEndAddress && otherAddress < thisEndAddress;
         }
 
+        /// <summary>
+        /// Checks if a given sub-range of memory is invalid.
+        /// Those are used to represent unmapped memory regions (holes in the region mapping).
+        /// </summary>
+        /// <param name="subRange">Memory range to checl</param>
+        /// <returns>True if the memory range is considered invalid, false otherwise</returns>
+        internal static bool IsInvalid(ref MemoryRange subRange)
+        {
+            return subRange.Address == ulong.MaxValue;
+        }
+
         /// <summary>
         /// Returns a string summary of the memory range.
         /// </summary>
diff --git a/src/Ryujinx.Memory/Range/MultiRangeList.cs b/src/Ryujinx.Memory/Range/MultiRangeList.cs
index 1804ff5c82..c3c6ae7972 100644
--- a/src/Ryujinx.Memory/Range/MultiRangeList.cs
+++ b/src/Ryujinx.Memory/Range/MultiRangeList.cs
@@ -30,7 +30,7 @@ namespace Ryujinx.Memory.Range
             {
                 var subrange = range.GetSubRange(i);
 
-                if (IsInvalid(ref subrange))
+                if (MemoryRange.IsInvalid(ref subrange))
                 {
                     continue;
                 }
@@ -56,7 +56,7 @@ namespace Ryujinx.Memory.Range
             {
                 var subrange = range.GetSubRange(i);
 
-                if (IsInvalid(ref subrange))
+                if (MemoryRange.IsInvalid(ref subrange))
                 {
                     continue;
                 }
@@ -99,7 +99,7 @@ namespace Ryujinx.Memory.Range
             {
                 var subrange = range.GetSubRange(i);
 
-                if (IsInvalid(ref subrange))
+                if (MemoryRange.IsInvalid(ref subrange))
                 {
                     continue;
                 }
@@ -142,17 +142,6 @@ namespace Ryujinx.Memory.Range
             return overlapCount;
         }
 
-        /// <summary>
-        /// Checks if a given sub-range of memory is invalid.
-        /// Those are used to represent unmapped memory regions (holes in the region mapping).
-        /// </summary>
-        /// <param name="subRange">Memory range to checl</param>
-        /// <returns>True if the memory range is considered invalid, false otherwise</returns>
-        private static bool IsInvalid(ref MemoryRange subRange)
-        {
-            return subRange.Address == ulong.MaxValue;
-        }
-
         /// <summary>
         /// Gets all items on the list starting at the specified memory address.
         /// </summary>