diff --git a/ChocolArm64/Events/AInvalidAccessEventArgs.cs b/ChocolArm64/Events/AInvalidAccessEventArgs.cs new file mode 100644 index 0000000000..a5c472a889 --- /dev/null +++ b/ChocolArm64/Events/AInvalidAccessEventArgs.cs @@ -0,0 +1,14 @@ +using System; + +namespace ChocolArm64.Events +{ + public class AInvalidAccessEventArgs : EventArgs + { + public long Position { get; private set; } + + public AInvalidAccessEventArgs(long Position) + { + this.Position = Position; + } + } +} \ No newline at end of file diff --git a/ChocolArm64/Memory/AMemory.cs b/ChocolArm64/Memory/AMemory.cs index bb6a2b549c..2854871e35 100644 --- a/ChocolArm64/Memory/AMemory.cs +++ b/ChocolArm64/Memory/AMemory.cs @@ -1,3 +1,4 @@ +using ChocolArm64.Events; using ChocolArm64.Exceptions; using ChocolArm64.State; using System; @@ -51,6 +52,8 @@ namespace ChocolArm64.Memory private byte*** PageTable; + public event EventHandler InvalidAccess; + public AMemory(IntPtr Ram) { Monitors = new Dictionary(); @@ -512,6 +515,8 @@ Unmapped: return (byte*)Ptr + (Position & PageMask); } + InvalidAccess?.Invoke(this, new AInvalidAccessEventArgs(Position)); + throw new VmmPageFaultException(Position); } @@ -560,6 +565,8 @@ Unmapped: return (byte*)Ptr + (Position & PageMask); } + InvalidAccess?.Invoke(this, new AInvalidAccessEventArgs(Position)); + throw new VmmPageFaultException(Position); } diff --git a/Ryujinx.HLE/HOS/Process.cs b/Ryujinx.HLE/HOS/Process.cs index ab0ab18ba1..3a02dd878d 100644 --- a/Ryujinx.HLE/HOS/Process.cs +++ b/Ryujinx.HLE/HOS/Process.cs @@ -67,6 +67,8 @@ namespace Ryujinx.HLE.HOS Memory = new AMemory(Device.Memory.RamPointer); + Memory.InvalidAccess += CpuInvalidAccessHandler; + MemoryManager = new KMemoryManager(this); TlsPages = new List(); @@ -96,7 +98,7 @@ namespace Ryujinx.HLE.HOS Executables = new List(); - ImageBase = MemoryManager.CodeRegionStart; + ImageBase = 0x8000000; } public void LoadProgram(IExecutable Program) @@ -334,6 +336,19 @@ namespace Ryujinx.HLE.HOS return Translator; } + private void CpuInvalidAccessHandler(object sender, AInvalidAccessEventArgs e) + { + foreach (KThread Thread in Threads.Values) + { + if (Thread.Thread.IsCurrentThread()) + { + PrintStackTrace(Thread.Thread.ThreadState); + + break; + } + } + } + public void PrintStackTrace(AThreadState ThreadState) { StringBuilder Trace = new StringBuilder();