From d0d5e92deffc066800df3056f9f5918996f3bb0a Mon Sep 17 00:00:00 2001
From: Ben Lawrence <65065992+Bentheminernz@users.noreply.github.com>
Date: Sat, 30 Nov 2024 19:51:32 +1300
Subject: [PATCH] Init MVK and adds commit facc12a from greemdev ryujinx
---
src/ARMeilleure/Common/AddressTableLevel.cs | 4 ++--
src/ARMeilleure/Translation/PTC/Ptc.cs | 2 +-
src/Ryujinx.Cpu/AddressTable.cs | 2 +-
src/Ryujinx.Headless.SDL2/Program.cs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ARMeilleure/Common/AddressTableLevel.cs b/src/ARMeilleure/Common/AddressTableLevel.cs
index 6107726ee..af3b9b99f 100644
--- a/src/ARMeilleure/Common/AddressTableLevel.cs
+++ b/src/ARMeilleure/Common/AddressTableLevel.cs
@@ -36,9 +36,9 @@ namespace ARMeilleure.Common
///
/// Guest address
/// Value of the from the specified guest
- public int GetValue(ulong address)
+ public long GetValue(ulong address)
{
- return (int)((address & Mask) >> Index);
+ return (long)((address & Mask) >> Index);
}
}
}
diff --git a/src/ARMeilleure/Translation/PTC/Ptc.cs b/src/ARMeilleure/Translation/PTC/Ptc.cs
index c722ce6be..841e5fefa 100644
--- a/src/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -30,7 +30,7 @@ namespace ARMeilleure.Translation.PTC
private const string OuterHeaderMagicString = "PTCohd\0\0";
private const string InnerHeaderMagicString = "PTCihd\0\0";
- private const uint InternalVersion = 6992; //! To be incremented manually for each change to the ARMeilleure project.
+ private const uint InternalVersion = 6997; //! To be incremented manually for each change to the ARMeilleure project.
private const string ActualDir = "0";
private const string BackupDir = "1";
diff --git a/src/Ryujinx.Cpu/AddressTable.cs b/src/Ryujinx.Cpu/AddressTable.cs
index d87b12ab0..038a2009c 100644
--- a/src/Ryujinx.Cpu/AddressTable.cs
+++ b/src/Ryujinx.Cpu/AddressTable.cs
@@ -238,7 +238,7 @@ namespace ARMeilleure.Common
{
TEntry* page = GetPage(address);
- int index = Levels[^1].GetValue(address);
+ long index = Levels[^1].GetValue(address);
EnsureMapped((IntPtr)(page + index));
diff --git a/src/Ryujinx.Headless.SDL2/Program.cs b/src/Ryujinx.Headless.SDL2/Program.cs
index 7fbf14619..1f5523ed6 100644
--- a/src/Ryujinx.Headless.SDL2/Program.cs
+++ b/src/Ryujinx.Headless.SDL2/Program.cs
@@ -130,7 +130,7 @@ namespace Ryujinx.Headless.SDL2
};
}
- if (OperatingSystem.IsMacOS())
+ if (OperatingSystem.IsMacOS() || OperatingSystem.IsIOS())
{
MVKInitialization.InitializeResolver();
}