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>

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 1ede9c729c08a51711862d8b077cc2231c751f57..01ce2b6edd2454011949096344269337d0cc45f8 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -431,6 +431,7 @@
   X64/Thunk16.asm\r
   X64/CpuIdEx.nasm\r
   X64/CpuIdEx.asm\r
+  X64/CpuId.nasm\r
   X64/CpuId.asm\r
   X64/LongJump.asm\r
   X64/SetJump.asm\r
@@ -609,6 +610,7 @@
   X64/LongJump.S | GCC \r
   X64/EnableDisableInterrupts.S | GCC \r
   X64/DisablePaging64.S | GCC \r
+  X64/CpuId.nasm| GCC\r
   X64/CpuId.S | GCC \r
   X64/CpuIdEx.nasm| GCC\r
   X64/CpuIdEx.S | GCC \r

diff --git a/MdePkg/Library/BaseLib/X64/CpuId.nasm b/MdePkg/Library/BaseLib/X64/CpuId.nasm
new file mode 100644 (file)
index 0000000..8f1e70d
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/CpuId.nasm
@@ -0,0 +1,64 @@
+;------------------------------------------------------------------------------\r
+;\r
+; Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+; This program and the accompanying materials\r
+; are licensed and made available under the terms and conditions of the BSD License\r
+; which accompanies this distribution.  The full text of the license may be found at\r
+; http://opensource.org/licenses/bsd-license.php.\r
+;\r
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+;\r
+; Module Name:\r
+;\r
+;   CpuId.Asm\r
+;\r
+; Abstract:\r
+;\r
+;   AsmCpuid function\r
+;\r
+; Notes:\r
+;\r
+;------------------------------------------------------------------------------\r
+\r
+    DEFAULT REL\r
+    SECTION .text\r
+\r
+;------------------------------------------------------------------------------\r
+;  VOID\r
+;  EFIAPI\r
+;  AsmCpuid (\r
+;    IN   UINT32  RegisterInEax,\r
+;    OUT  UINT32  *RegisterOutEax  OPTIONAL,\r
+;    OUT  UINT32  *RegisterOutEbx  OPTIONAL,\r
+;    OUT  UINT32  *RegisterOutEcx  OPTIONAL,\r
+;    OUT  UINT32  *RegisterOutEdx  OPTIONAL\r
+;    )\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(AsmCpuid)\r
+ASM_PFX(AsmCpuid):\r
+    push    rbx\r
+    mov     eax, ecx\r
+    push    rax                         ; save Index on stack\r
+    push    rdx\r
+    cpuid\r
+    test    r9, r9\r
+    jz      .0\r
+    mov     [r9], ecx\r
+.0:\r
+    pop     rcx\r
+    jrcxz   .1\r
+    mov     [rcx], eax\r
+.1:\r
+    mov     rcx, r8\r
+    jrcxz   .2\r
+    mov     [rcx], ebx\r
+.2:\r
+    mov     rcx, [rsp + 0x38]\r
+    jrcxz   .3\r
+    mov     [rcx], edx\r
+.3:\r
+    pop     rax                         ; restore Index to rax as return value\r
+    pop     rbx\r
+    ret\r
+\r