From 25d8e7e733f7bef242c7197d49a0dacbee5f6a63 Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Tue, 13 Mar 2018 21:24:17 -0300
Subject: [PATCH] Add pl:u stub, use higher precision on CNTPCT_EL0 register
 tick count

---
 Instruction/AInstEmitSystem.cs |  1 +
 State/AThreadState.cs          | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Instruction/AInstEmitSystem.cs b/Instruction/AInstEmitSystem.cs
index 42a6200..1c5d026 100644
--- a/Instruction/AInstEmitSystem.cs
+++ b/Instruction/AInstEmitSystem.cs
@@ -30,6 +30,7 @@ namespace ChocolArm64.Instruction
                 case 0b11_011_0100_0100_001: PropName = nameof(AThreadState.Fpsr);      break;
                 case 0b11_011_1101_0000_010: PropName = nameof(AThreadState.TpidrEl0);  break;
                 case 0b11_011_1101_0000_011: PropName = nameof(AThreadState.Tpidr);     break;
+                case 0b11_011_1110_0000_000: PropName = nameof(AThreadState.CntfrqEl0); break;
                 case 0b11_011_1110_0000_001: PropName = nameof(AThreadState.CntpctEl0); break;
 
                 default: throw new NotImplementedException($"Unknown MRS at {Op.Position:x16}");
diff --git a/State/AThreadState.cs b/State/AThreadState.cs
index ec8621b..6f3f62f 100644
--- a/State/AThreadState.cs
+++ b/State/AThreadState.cs
@@ -1,5 +1,6 @@
 using ChocolArm64.Events;
 using System;
+using System.Diagnostics;
 
 namespace ChocolArm64.State
 {
@@ -40,15 +41,34 @@ namespace ChocolArm64.State
         public uint CtrEl0   => 0x8444c004;
         public uint DczidEl0 => 0x00000004;
 
-        private const ulong TicksPerS  = 19_200_000;
-        private const ulong TicksPerMS = TicksPerS / 1_000;
+        public ulong CntfrqEl0 { get; set; }
+        public ulong CntpctEl0
+        {
+            get
+            {
+                double Ticks = TickCounter.ElapsedTicks * HostTickFreq;
 
-        public ulong CntpctEl0 => (ulong)Environment.TickCount * TicksPerMS;
+                return (ulong)(Ticks * CntfrqEl0);
+            }
+        }
 
         public event EventHandler<AInstExceptionEventArgs> Break;
         public event EventHandler<AInstExceptionEventArgs> SvcCall;
         public event EventHandler<AInstUndefinedEventArgs> Undefined;
 
+        private static Stopwatch TickCounter;
+
+        private static double HostTickFreq;
+
+        static AThreadState()
+        {
+            HostTickFreq = 1.0 / Stopwatch.Frequency;
+
+            TickCounter = new Stopwatch();
+
+            TickCounter.Start();
+        }
+
         internal void OnBreak(int Imm)
         {
             Break?.Invoke(this, new AInstExceptionEventArgs(Imm));