gdkchan 8 лет назад
Родитель
Сommit
28275a8976
3 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      ChocolArm64/State/AThreadState.cs
  2. 2 2
      Ryujinx.Core/Hid/Hid.cs
  3. 1 1
      Ryujinx.Core/OsHle/Svc/SvcSystem.cs

+ 3 - 3
ChocolArm64/State/AThreadState.cs

@@ -38,10 +38,10 @@ namespace ChocolArm64.State
         public uint CtrEl0   => 0x8444c004;
         public uint CtrEl0   => 0x8444c004;
         public uint DczidEl0 => 0x00000004;
         public uint DczidEl0 => 0x00000004;
 
 
-        private const long TicksPerS  = 19_200_000;
-        private const long TicksPerMS = TicksPerS / 1_000;
+        private const ulong TicksPerS  = 19_200_000;
+        private const ulong TicksPerMS = TicksPerS / 1_000;
 
 
-        public long CntpctEl0 => Environment.TickCount * TicksPerMS;
+        public ulong CntpctEl0 => (ulong)Environment.TickCount * TicksPerMS;
 
 
         public event EventHandler<AInstExceptionEventArgs> Break;
         public event EventHandler<AInstExceptionEventArgs> Break;
         public event EventHandler<AInstExceptionEventArgs> SvcCall;
         public event EventHandler<AInstExceptionEventArgs> SvcCall;

+ 2 - 2
Ryujinx.Core/Hid/Hid.cs

@@ -258,9 +258,9 @@ namespace Ryujinx.Core.Input
             }
             }
         }
         }
 
 
-        private long GetTimestamp()
+        private static long GetTimestamp()
         {
         {
-            return Environment.TickCount * 19_200;
+            return (long)((ulong)Environment.TickCount * 19_200);
         }
         }
     }
     }
 }
 }

+ 1 - 1
Ryujinx.Core/OsHle/Svc/SvcSystem.cs

@@ -67,7 +67,7 @@ namespace Ryujinx.Core.OsHle.Svc
 
 
         private void SvcGetSystemTick(AThreadState ThreadState)
         private void SvcGetSystemTick(AThreadState ThreadState)
         {
         {
-            ThreadState.X0 = (ulong)ThreadState.CntpctEl0;
+            ThreadState.X0 = ThreadState.CntpctEl0;
         }
         }
 
 
         private void SvcConnectToNamedPort(AThreadState ThreadState)
         private void SvcConnectToNamedPort(AThreadState ThreadState)