From c7f75a99d60f27befdcdb79271db9c09cb546019 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 30 May 2016 18:51:59 -0700 Subject: [PATCH] MdePkg BaseLib: Convert Ia32/CpuIdEx.asm to NASM The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert Ia32/CpuIdEx.asm to Ia32/CpuIdEx.nasm Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen --- MdePkg/Library/BaseLib/BaseLib.inf | 2 + MdePkg/Library/BaseLib/Ia32/CpuIdEx.nasm | 67 ++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 MdePkg/Library/BaseLib/Ia32/CpuIdEx.nasm diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf index b44c49380d..d87975d542 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -332,6 +332,7 @@ Ia32/DisableInterrupts.asm | INTEL Ia32/CpuPause.nasm| INTEL Ia32/CpuPause.asm | INTEL + Ia32/CpuIdEx.nasm| INTEL Ia32/CpuIdEx.asm | INTEL Ia32/CpuId.asm | INTEL Ia32/CpuBreakpoint.asm | INTEL @@ -359,6 +360,7 @@ Ia32/Mwait.S | GCC Ia32/Monitor.nasm| GCC Ia32/Monitor.S | GCC + Ia32/CpuIdEx.nasm| GCC Ia32/CpuIdEx.S | GCC Ia32/CpuId.S | GCC Ia32/LongJump.nasm| GCC diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.nasm b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.nasm new file mode 100644 index 0000000000..61efe4b6ed --- /dev/null +++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.nasm @@ -0,0 +1,67 @@ +;------------------------------------------------------------------------------ +; +; Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+; 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: +; +; CpuIdEx.Asm +; +; Abstract: +; +; AsmCpuidEx function +; +; Notes: +; +;------------------------------------------------------------------------------ + + SECTION .text + +;------------------------------------------------------------------------------ +; UINT32 +; EFIAPI +; AsmCpuidEx ( +; IN UINT32 RegisterInEax, +; IN UINT32 RegisterInEcx, +; OUT UINT32 *RegisterOutEax OPTIONAL, +; OUT UINT32 *RegisterOutEbx OPTIONAL, +; OUT UINT32 *RegisterOutEcx OPTIONAL, +; OUT UINT32 *RegisterOutEdx OPTIONAL +; ) +;------------------------------------------------------------------------------ +global ASM_PFX(AsmCpuidEx) +ASM_PFX(AsmCpuidEx): + push ebx + push ebp + mov ebp, esp + mov eax, [ebp + 12] + mov ecx, [ebp + 16] + cpuid + push ecx + mov ecx, [ebp + 20] + jecxz .0 + mov [ecx], eax +.0: + mov ecx, [ebp + 24] + jecxz .1 + mov [ecx], ebx +.1: + mov ecx, [ebp + 32] + jecxz .2 + mov [ecx], edx +.2: + mov ecx, [ebp + 28] + jecxz .3 + pop DWORD [ecx] +.3: + mov eax, [ebp + 12] + leave + pop ebx + ret + -- 2.39.2