ryujinx-archive/ChocolArm64
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some thread sync issues (#172)

Browse source 
* Fix some thread sync issues

* Remove some debug stuff

* Ensure that writes to the mutex address clears the exclusive monitor
This commit is contained in:
gdkchan 2018-06-21 23:05:42 -03:00 committed by GitHub
parent 32900cc223
commit f6ff678834
3 changed files with 70 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AThread.cs
View file

@ -46,7 +46,7 @@ namespace ChocolArm64
{ {
Translator.ExecuteSubroutine(this, EntryPoint); Translator.ExecuteSubroutine(this, EntryPoint);
Memory.RemoveMonitor(ThreadId); Memory.RemoveMonitor(ThreadState);
WorkFinished?.Invoke(this, EventArgs.Empty); WorkFinished?.Invoke(this, EventArgs.Empty);
}); });

22
Instruction/AInstEmitMemoryEx.cs
View file

@ -48,6 +48,16 @@ namespace ChocolArm64.Instruction
{ {
AOpCodeMemEx Op = (AOpCodeMemEx)Context.CurrOp; AOpCodeMemEx Op = (AOpCodeMemEx)Context.CurrOp;
if (AccType.HasFlag(AccessType.Ordered))
{
EmitBarrier(Context);
}
if (AccType.HasFlag(AccessType.Exclusive))
{
EmitMemoryCall(Context, nameof(AMemory.SetExclusive), Op.Rn);
}
Context.EmitLdarg(ATranslatedSub.MemoryArgIdx); Context.EmitLdarg(ATranslatedSub.MemoryArgIdx);
Context.EmitLdint(Op.Rn); Context.EmitLdint(Op.Rn);
@ -67,16 +77,6 @@ namespace ChocolArm64.Instruction
Context.EmitStintzr(Op.Rt2); Context.EmitStintzr(Op.Rt2);
} }
if (AccType.HasFlag(AccessType.Exclusive))
{
EmitMemoryCall(Context, nameof(AMemory.SetExclusive), Op.Rn);
}
if (AccType.HasFlag(AccessType.Ordered))
{
EmitBarrier(Context);
}
} }
public static void Pfrm(AILEmitterCtx Context) public static void Pfrm(AILEmitterCtx Context)
@ -150,7 +150,7 @@ namespace ChocolArm64.Instruction
Context.EmitLdc_I8(0); Context.EmitLdc_I8(0);
Context.EmitStintzr(Op.Rs); Context.EmitStintzr(Op.Rs);
Clrex(Context); EmitMemoryCall(Context, nameof(AMemory.ClearExclusiveForStore));
} }
Context.MarkLabel(LblEnd); Context.MarkLabel(LblEnd);

105
Memory/AMemory.cs
View file

@ -6,6 +6,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Runtime.Intrinsics; using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.X86; using System.Runtime.Intrinsics.X86;
using System.Threading;
namespace ChocolArm64.Memory namespace ChocolArm64.Memory
{ {
@ -15,32 +16,18 @@ namespace ChocolArm64.Memory
public AMemoryMgr Manager { get; private set; } public AMemoryMgr Manager { get; private set; }
private struct ExMonitor private class ArmMonitor
{ {
public long Position { get; private set; } public long Position;
public bool ExState;
private bool ExState;
public ExMonitor(long Position, bool ExState)
{
this.Position = Position;
this.ExState = ExState;
}
public bool HasExclusiveAccess(long Position) public bool HasExclusiveAccess(long Position)
{ {
return this.Position == Position && ExState; return this.Position == Position && ExState;
} }
public void Reset()
{
ExState = false;
}
} }
private Dictionary<int, ExMonitor> Monitors; private Dictionary<int, ArmMonitor> Monitors;
private HashSet<long> ExAddrs;
public IntPtr Ram { get; private set; } public IntPtr Ram { get; private set; }
@ -50,9 +37,7 @@ namespace ChocolArm64.Memory
{ {
Manager = new AMemoryMgr(); Manager = new AMemoryMgr();
Monitors = new Dictionary<int, ExMonitor>(); Monitors = new Dictionary<int, ArmMonitor>();
ExAddrs = new HashSet<long>();
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
@ -66,16 +51,13 @@ namespace ChocolArm64.Memory
RamPtr = (byte*)Ram; RamPtr = (byte*)Ram;
} }
public void RemoveMonitor(int ThreadId) public void RemoveMonitor(AThreadState State)
{ {
lock (Monitors) lock (Monitors)
{ {
if (Monitors.TryGetValue(ThreadId, out ExMonitor Monitor)) ClearExclusive(State);
{
ExAddrs.Remove(Monitor.Position);
}
Monitors.Remove(ThreadId); Monitors.Remove(State.ThreadId);
} }
} }
@ -85,66 +67,85 @@ namespace ChocolArm64.Memory
lock (Monitors) lock (Monitors)
{ {
if (Monitors.TryGetValue(ThreadState.ThreadId, out ExMonitor Monitor)) foreach (ArmMonitor Mon in Monitors.Values)
{ {
ExAddrs.Remove(Monitor.Position); if (Mon.Position == Position && Mon.ExState)
{
Mon.ExState = false;
}
} }
bool ExState = ExAddrs.Add(Position); if (!Monitors.TryGetValue(ThreadState.ThreadId, out ArmMonitor ThreadMon))
Monitor = new ExMonitor(Position, ExState);
if (!Monitors.TryAdd(ThreadState.ThreadId, Monitor))
{ {
Monitors[ThreadState.ThreadId] = Monitor; ThreadMon = new ArmMonitor();
Monitors.Add(ThreadState.ThreadId, ThreadMon);
} }
ThreadMon.Position = Position;
ThreadMon.ExState = true;
} }
} }
public bool TestExclusive(AThreadState ThreadState, long Position) public bool TestExclusive(AThreadState ThreadState, long Position)
{ {
//Note: Any call to this method also should be followed by a
//call to ClearExclusiveForStore if this method returns true.
Position &= ~ErgMask; Position &= ~ErgMask;
lock (Monitors) Monitor.Enter(Monitors);
{
if (!Monitors.TryGetValue(ThreadState.ThreadId, out ExMonitor Monitor)) if (!Monitors.TryGetValue(ThreadState.ThreadId, out ArmMonitor ThreadMon))
{ {
return false; return false;
} }
return Monitor.HasExclusiveAccess(Position); bool ExState = ThreadMon.HasExclusiveAccess(Position);
if (!ExState)
{
Monitor.Exit(Monitors);
} }
return ExState;
}
public void ClearExclusiveForStore(AThreadState ThreadState)
{
if (Monitors.TryGetValue(ThreadState.ThreadId, out ArmMonitor ThreadMon))
{
ThreadMon.ExState = false;
}
Monitor.Exit(Monitors);
} }
public void ClearExclusive(AThreadState ThreadState) public void ClearExclusive(AThreadState ThreadState)
{ {
lock (Monitors) lock (Monitors)
{ {
if (Monitors.TryGetValue(ThreadState.ThreadId, out ExMonitor Monitor)) if (Monitors.TryGetValue(ThreadState.ThreadId, out ArmMonitor ThreadMon))
{ {
Monitor.Reset(); ThreadMon.ExState = false;
ExAddrs.Remove(Monitor.Position);
} }
} }
} }
public bool AcquireAddress(long Position) public void WriteInt32ToSharedAddr(long Position, int Value)
{ {
Position &= ~ErgMask; long MaskedPosition = Position & ~ErgMask;
lock (Monitors) lock (Monitors)
{ {
return ExAddrs.Add(Position); foreach (ArmMonitor Mon in Monitors.Values)
{
if (Mon.Position == MaskedPosition && Mon.ExState)
{
Mon.ExState = false;
} }
} }
public void ReleaseAddress(long Position) WriteInt32(Position, Value);
{
Position &= ~ErgMask;
lock (Monitors)
{
ExAddrs.Remove(Position);
} }
} }