Просмотр исходного кода

Update to new standard for volatility operations (#6682)

Marco Carvalho 2 лет назад
Родитель
Сommit
22fb8c9d4f
2 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      src/Ryujinx.HLE/HOS/TamperMachine.cs
  2. 3 3
      src/Ryujinx.Tests/Memory/PartialUnmaps.cs

+ 3 - 3
src/Ryujinx.HLE/HOS/TamperMachine.cs

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

+ 3 - 3
src/Ryujinx.Tests/Memory/PartialUnmaps.cs

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