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

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

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

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 1ede9c729c..01ce2b6edd 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -431,6 +431,7 @@
   X64/Thunk16.asm
   X64/CpuIdEx.nasm
   X64/CpuIdEx.asm
+  X64/CpuId.nasm
   X64/CpuId.asm
   X64/LongJump.asm
   X64/SetJump.asm
@@ -609,6 +610,7 @@
   X64/LongJump.S | GCC 
   X64/EnableDisableInterrupts.S | GCC 
   X64/DisablePaging64.S | GCC 
+  X64/CpuId.nasm| GCC
   X64/CpuId.S | GCC 
   X64/CpuIdEx.nasm| GCC
   X64/CpuIdEx.S | GCC 
diff --git a/MdePkg/Library/BaseLib/X64/CpuId.nasm b/MdePkg/Library/BaseLib/X64/CpuId.nasm
new file mode 100644
index 0000000000..8f1e70dc6b
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/CpuId.nasm
@@ -0,0 +1,64 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006 - 2008, 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:
+;
+;   CpuId.Asm
+;
+; Abstract:
+;
+;   AsmCpuid function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    DEFAULT REL
+    SECTION .text
+
+;------------------------------------------------------------------------------
+;  VOID
+;  EFIAPI
+;  AsmCpuid (
+;    IN   UINT32  RegisterInEax,
+;    OUT  UINT32  *RegisterOutEax  OPTIONAL,
+;    OUT  UINT32  *RegisterOutEbx  OPTIONAL,
+;    OUT  UINT32  *RegisterOutEcx  OPTIONAL,
+;    OUT  UINT32  *RegisterOutEdx  OPTIONAL
+;    )
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmCpuid)
+ASM_PFX(AsmCpuid):
+    push    rbx
+    mov     eax, ecx
+    push    rax                         ; save Index on stack
+    push    rdx
+    cpuid
+    test    r9, r9
+    jz      .0
+    mov     [r9], ecx
+.0:
+    pop     rcx
+    jrcxz   .1
+    mov     [rcx], eax
+.1:
+    mov     rcx, r8
+    jrcxz   .2
+    mov     [rcx], ebx
+.2:
+    mov     rcx, [rsp + 0x38]
+    jrcxz   .3
+    mov     [rcx], edx
+.3:
+    pop     rax                         ; restore Index to rax as return value
+    pop     rbx
+    ret
+