mirror of
https://github.com/GreemDev/Ryujinx
synced 2024-11-22 09:53:35 +01:00
HashSet is not thread safe, hopefully this fixes the CPU issue where it throws a exception on Add
This commit is contained in:
parent
a20d6b34ab
commit
e16ca561cb
1 changed files with 16 additions and 10 deletions
|
@ -107,25 +107,31 @@ namespace ChocolArm64
|
||||||
|
|
||||||
ATranslatedSub Subroutine = Context.GetSubroutine();
|
ATranslatedSub Subroutine = Context.GetSubroutine();
|
||||||
|
|
||||||
if (SubBlocks.Contains(Position))
|
lock (SubBlocks)
|
||||||
{
|
{
|
||||||
SubBlocks.Remove(Position);
|
if (SubBlocks.Contains(Position))
|
||||||
|
{
|
||||||
|
SubBlocks.Remove(Position);
|
||||||
|
|
||||||
Subroutine.SetType(ATranslatedSubType.SubBlock);
|
Subroutine.SetType(ATranslatedSubType.SubBlock);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Subroutine.SetType(ATranslatedSubType.SubTier0);
|
Subroutine.SetType(ATranslatedSubType.SubTier0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CachedSubs.AddOrUpdate(Position, Subroutine, (Key, OldVal) => Subroutine);
|
CachedSubs.AddOrUpdate(Position, Subroutine, (Key, OldVal) => Subroutine);
|
||||||
|
|
||||||
AOpCode LastOp = Block.GetLastOp();
|
AOpCode LastOp = Block.GetLastOp();
|
||||||
|
|
||||||
if (LastOp.Emitter != AInstEmit.Ret &&
|
lock (SubBlocks)
|
||||||
LastOp.Emitter != AInstEmit.Br)
|
|
||||||
{
|
{
|
||||||
SubBlocks.Add(LastOp.Position + 4);
|
if (LastOp.Emitter != AInstEmit.Ret &&
|
||||||
|
LastOp.Emitter != AInstEmit.Br)
|
||||||
|
{
|
||||||
|
SubBlocks.Add(LastOp.Position + 4);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Subroutine;
|
return Subroutine;
|
||||||
|
|
Loading…
Reference in a new issue