MdePkg BaseLib: Convert Ia32/CpuId.asm to NASM

The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/CpuId.asm to Ia32/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 d87975d54220cae784b3540c9df867977ebc34b1..0cc7c9310cc7194f9b1ad2b0236578bf203bbe26 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -334,6 +334,7 @@
   Ia32/CpuPause.asm | INTEL \r
   Ia32/CpuIdEx.nasm| INTEL\r
   Ia32/CpuIdEx.asm | INTEL \r
+  Ia32/CpuId.nasm| INTEL\r
   Ia32/CpuId.asm | INTEL \r
   Ia32/CpuBreakpoint.asm | INTEL \r
   Ia32/ARShiftU64.asm | INTEL \r
@@ -362,6 +363,7 @@
   Ia32/Monitor.S | GCC \r
   Ia32/CpuIdEx.nasm| GCC\r
   Ia32/CpuIdEx.S | GCC \r
+  Ia32/CpuId.nasm| GCC\r
   Ia32/CpuId.S | GCC \r
   Ia32/LongJump.nasm| GCC\r
   Ia32/LongJump.S | GCC \r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.nasm b/MdePkg/Library/BaseLib/Ia32/CpuId.nasm
new file mode 100644 (file)
index 0000000..d8f0ed0
--- /dev/null
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.nasm
@@ -0,0 +1,65 @@
+;------------------------------------------------------------------------------\r
+;\r
+; Copyright (c) 2006, 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
+    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    ebx\r
+    push    ebp\r
+    mov     ebp, esp\r
+    mov     eax, [ebp + 12]\r
+    cpuid\r
+    push    ecx\r
+    mov     ecx, [ebp + 16]\r
+    jecxz   .0\r
+    mov     [ecx], eax\r
+.0:\r
+    mov     ecx, [ebp + 20]\r
+    jecxz   .1\r
+    mov     [ecx], ebx\r
+.1:\r
+    mov     ecx, [ebp + 24]\r
+    jecxz   .2\r
+    pop     DWORD [ecx]\r
+.2:\r
+    mov     ecx, [ebp + 28]\r
+    jecxz   .3\r
+    mov     [ecx], edx\r
+.3:\r
+    mov     eax, [ebp + 12]\r
+    leave\r
+    pop     ebx\r
+    ret\r
+\r