emu-mirrors/ryujinx-fork
0
0
Fork 0
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2024-12-23 02:45:45 +00:00
Code Activity

Print stack trace on invalid memory accesses (#461)

Browse source 
* Print stack trace on invalid memory accesses

* Rebased, change code region base address for 39-bits address space, print stack trace on break and undefined instructions too
This commit is contained in:
gdkchan 2018-10-20 19:07:52 -03:00 committed by Ac_K
parent 0e1e094b7a
commit 2cb8541462
5 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChocolArm64/Events/AInvalidAccessEventArgs.cs Normal file
View file

@ -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;
}
}
}

7
ChocolArm64/Memory/AMemory.cs
View file

@ -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<AInvalidAccessEventArgs> InvalidAccess;
public AMemory(IntPtr Ram)
{
Monitors = new Dictionary<int, ArmMonitor>();
@ -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);
}

2
Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs
View file

@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Kernel
break;
case AddressSpaceType.Addr39Bits:
CodeRegionStart = 0;
CodeRegionStart = 0x8000000;
CodeRegionSize = 0x80000000;
MapRegionSize = 0x1000000000;
HeapRegionSize = 0x180000000;

24
Ryujinx.HLE/HOS/Process.cs
View file

@ -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();

7
Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs
View file

@ -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));