From 0c2d88ce64ea00ca3fffed28422765b66d6703d1 Mon Sep 17 00:00:00 2001
From: Quajak <jasper.gerigk@gmx.net>
Date: Sat, 26 Oct 2019 13:36:10 -0400
Subject: [PATCH] Fix merge

---
 .../CPU/CPUReadModelSpecificRegisterAsm.cs    | 40 +++++++++++++++++++
 source/Cosmos.Core_Asm/CPUImpl.cs             |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 source/Cosmos.Core_Asm/CPU/CPUReadModelSpecificRegisterAsm.cs

diff --git a/source/Cosmos.Core_Asm/CPU/CPUReadModelSpecificRegisterAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUReadModelSpecificRegisterAsm.cs
new file mode 100644
index 000000000..8083476e8
--- /dev/null
+++ b/source/Cosmos.Core_Asm/CPU/CPUReadModelSpecificRegisterAsm.cs
@@ -0,0 +1,40 @@
+using XSharp.Assembler;
+
+namespace Cosmos.Core_Asm
+{
+    public class CPUReadModelSpecificRegisterAsm : AssemblerMethod
+    {
+        public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
+        {
+            /*
+             * ; esi register layout: (mperf_hi, mperf_lo, aperf_hi, aperf_lo)
+             * ;
+             * ; int* ptr = new int[4];
+             * ;
+             * lea esi,        ptr  ;equivalent with `mov esi, &ptr`
+             * mov ecx,        e7h
+             * rdmsr
+             * mov [esi + 4],  eax
+             * mov [esi],      edx
+             * mov ecx,        e8h
+             * rdmsr
+             * mov [esi + 12], eax
+             * mov [esi + 8],  edx
+             * xor eax,        eax
+             * ret
+             */
+
+            //XS.Lea(XSRegisters.ESI, intname);
+            //XS.Set(XSRegisters.ECX, 0xe7);
+            //XS.Rdmsr();
+            //XS.Set(XSRegisters.EAX, XSRegisters.ESI, destinationIsIndirect: true, destinationDisplacement: 4);
+            //XS.Set(XSRegisters.EDX, XSRegisters.ESI, destinationIsIndirect: true, destinationDisplacement: 0);
+            //XS.Set(XSRegisters.ECX, 0xe8);
+            //XS.Rdmsr();
+            //XS.Set(XSRegisters.EAX, XSRegisters.ESI, destinationIsIndirect: true, destinationDisplacement: 12);
+            //XS.Set(XSRegisters.EDX, XSRegisters.ESI, destinationIsIndirect: true, destinationDisplacement: 8);
+            //XS.Xor(XSRegisters.EAX, XSRegisters.EAX);
+            //XS.Return();
+        }
+    }
+}
diff --git a/source/Cosmos.Core_Asm/CPUImpl.cs b/source/Cosmos.Core_Asm/CPUImpl.cs
index 16039be2e..005f8e9a8 100644
--- a/source/Cosmos.Core_Asm/CPUImpl.cs
+++ b/source/Cosmos.Core_Asm/CPUImpl.cs
@@ -1,3 +1,4 @@
+using System;
 using Cosmos.Core;
 
 using IL2CPU.API.Attribs;