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

Update to new standard for volatility operations (#6682)

Browse source
This commit is contained in:
Marco Carvalho 2024-04-19 09:03:52 -03:00 committed by GitHub
parent 2f93ae9a19
commit 22fb8c9d4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ryujinx.HLE/HOS/TamperMachine.cs
View file

@ -143,7 +143,7 @@ namespace Ryujinx.HLE.HOS
try try
{ {
ControllerKeys pressedKeys = (ControllerKeys)Thread.VolatileRead(ref _pressedKeys); ControllerKeys pressedKeys = (ControllerKeys)Volatile.Read(ref _pressedKeys);
program.Process.TamperedCodeMemory = false; program.Process.TamperedCodeMemory = false;
program.Execute(pressedKeys); program.Execute(pressedKeys);
@ -175,14 +175,14 @@ namespace Ryujinx.HLE.HOS
{ {
if (input.PlayerId == PlayerIndex.Player1 || input.PlayerId == PlayerIndex.Handheld) if (input.PlayerId == PlayerIndex.Player1 || input.PlayerId == PlayerIndex.Handheld)
{ {
Thread.VolatileWrite(ref _pressedKeys, (long)input.Buttons); Volatile.Write(ref _pressedKeys, (long)input.Buttons);
return; return;
} }
} }
// Clear the input because player one is not conected. // Clear the input because player one is not conected.
Thread.VolatileWrite(ref _pressedKeys, 0); Volatile.Write(ref _pressedKeys, 0);
} }
} }
} }

6
src/Ryujinx.Tests/Memory/PartialUnmaps.cs
View file

@ -388,14 +388,14 @@ namespace Ryujinx.Tests.Memory
{ {
rwLock.AcquireReaderLock(); rwLock.AcquireReaderLock();
int originalValue = Thread.VolatileRead(ref value); int originalValue = Volatile.Read(ref value);
count++; count++;
// Spin a bit. // Spin a bit.
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
{ {
if (Thread.VolatileRead(ref readersAllowed) == 0) if (Volatile.Read(ref readersAllowed) == 0)
{ {
error = true; error = true;
running = false; running = false;
@ -403,7 +403,7 @@ namespace Ryujinx.Tests.Memory
} }
// Should not change while the lock is held. // Should not change while the lock is held.
if (Thread.VolatileRead(ref value) != originalValue) if (Volatile.Read(ref value) != originalValue)
{ {
error = true; error = true;
running = false; running = false;