diff options
Diffstat (limited to 'Ryujinx.HLE')
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Process.cs | 24 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs | 7 |
3 files changed, 32 insertions, 1 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs index 8871cbe7..8cf73785 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 448f1afa..1d8bfeb8 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<KTlsPageManager>(); @@ -283,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); } @@ -334,6 +340,24 @@ namespace Ryujinx.HLE.HOS return Translator; } + private void CpuInvalidAccessHandler(object sender, AInvalidAccessEventArgs e) + { + PrintStackTraceForCurrentThread(); + } + + private void PrintStackTraceForCurrentThread() + { + foreach (KThread Thread in Threads.Values) + { + if (Thread.Context.IsCurrentThread()) + { + PrintStackTrace(Thread.Context.ThreadState); + + break; + } + } + } + public void PrintStackTrace(AThreadState ThreadState) { StringBuilder Trace = new StringBuilder(); diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs index bee574ff..044b2efc 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)); |