From f84fb93a4f96ba130ec38526f3797423c2e68135 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Mon, 30 May 2016 18:52:05 -0700
Subject: [PATCH] MdePkg BaseLib: Convert X64/ReadMsr64.asm to NASM

The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
X64/ReadMsr64.asm to X64/ReadMsr64.nasm

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
 MdePkg/Library/BaseLib/BaseLib.inf        |  1 +
 MdePkg/Library/BaseLib/X64/ReadMsr64.nasm | 40 +++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 MdePkg/Library/BaseLib/X64/ReadMsr64.nasm

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 7f4ba3fb09..121d2f72c6 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -590,6 +590,7 @@
   X64/CpuBreakpoint.asm | INTEL 
   X64/WriteMsr64.nasm| INTEL
   X64/WriteMsr64.asm | INTEL 
+  X64/ReadMsr64.nasm| INTEL
   X64/ReadMsr64.asm | INTEL 
   X64/RdRand.nasm| INTEL
   X64/RdRand.asm | INTEL
diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.nasm b/MdePkg/Library/BaseLib/X64/ReadMsr64.nasm
new file mode 100644
index 0000000000..2435e19d59
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/ReadMsr64.nasm
@@ -0,0 +1,40 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+; This program and the accompanying materials
+; are licensed and made available under the terms and conditions of the BSD License
+; which accompanies this distribution.  The full text of the license may be found at
+; http://opensource.org/licenses/bsd-license.php.
+;
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+;
+; Module Name:
+;
+;   ReadMsr64.Asm
+;
+; Abstract:
+;
+;   AsmReadMsr64 function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    DEFAULT REL
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINT64
+; EFIAPI
+; AsmReadMsr64 (
+;   IN UINT32  Index
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmReadMsr64)
+ASM_PFX(AsmReadMsr64):
+    rdmsr                               ; edx & eax are zero extended
+    shl     rdx, 0x20
+    or      rax, rdx
+    ret
+