From c38f4df5219fd5032e235a664d2cb48273b77b80 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Wed, 17 Oct 2018 13:24:22 -0300 Subject: [PATCH] Rebased, change code region base address for 39-bits address space, print stack trace on break and undefined instructions too --- Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs | 2 +- Ryujinx.HLE/HOS/Process.cs | 15 ++++++++++++--- .../Services/Aud/AudioRenderer/VoiceContext.cs | 7 +++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs index 8871cbe7d6..8cf73785e0 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs @@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Kernel break; case AddressSpaceType.Addr39Bits: - CodeRegionStart = 0; + CodeRegionStart = 0x8000000; CodeRegionSize = 0x80000000; MapRegionSize = 0x1000000000; HeapRegionSize = 0x180000000; diff --git a/Ryujinx.HLE/HOS/Process.cs b/Ryujinx.HLE/HOS/Process.cs index 3a02dd878d..f99a20f6c1 100644 --- a/Ryujinx.HLE/HOS/Process.cs +++ b/Ryujinx.HLE/HOS/Process.cs @@ -98,7 +98,7 @@ namespace Ryujinx.HLE.HOS Executables = new List(); - ImageBase = 0x8000000; + ImageBase = MemoryManager.CodeRegionStart; } public void LoadProgram(IExecutable Program) @@ -285,11 +285,15 @@ namespace Ryujinx.HLE.HOS private void BreakHandler(object sender, AInstExceptionEventArgs e) { + PrintStackTraceForCurrentThread(); + throw new GuestBrokeExecutionException(); } private void UndefinedHandler(object sender, AInstUndefinedEventArgs e) { + PrintStackTraceForCurrentThread(); + throw new UndefinedInstructionException(e.Position, e.RawOpCode); } @@ -337,12 +341,17 @@ namespace Ryujinx.HLE.HOS } private void CpuInvalidAccessHandler(object sender, AInvalidAccessEventArgs e) + { + PrintStackTraceForCurrentThread(); + } + + private void PrintStackTraceForCurrentThread() { foreach (KThread Thread in Threads.Values) { - if (Thread.Thread.IsCurrentThread()) + if (Thread.Context.IsCurrentThread()) { - PrintStackTrace(Thread.Thread.ThreadState); + PrintStackTrace(Thread.Context.ThreadState); break; } diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs index bee574ff85..044b2efc2c 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs @@ -125,6 +125,13 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer //As of now, it assumes that HostChannelsCount == 2. WaveBuffer Wb = WaveBuffers[BufferIndex]; + if (Wb.Position == 0) + { + Samples = new int[0]; + + return; + } + if (SampleFormat == SampleFormat.PcmInt16) { int SamplesCount = (int)(Wb.Size / (sizeof(short) * ChannelsCount));