emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

HashSet is not thread safe, hopefully this fixes the CPU issue where it throws a exception on Add

Browse source
This commit is contained in:
gdkchan 2018-04-04 18:17:37 -03:00
parent a20d6b34ab
commit e16ca561cb
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ChocolArm64/ATranslator.cs
View file

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