From: Jordan Justen Date: Fri, 31 Oct 2014 20:54:54 +0000 (+0000) Subject: OvmfPkg QemuFwCfgLib: Convert X64/IoLibExAsm.asm to NASM X-Git-Tag: edk2-stable201903~10720 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=f0a071731713f9a36f10a6335fd1cd33c07cf542 OvmfPkg QemuFwCfgLib: Convert X64/IoLibExAsm.asm to NASM The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert X64/IoLibExAsm.asm to X64/IoLibExAsm.nasm Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Reviewed-by: Laszlo Ersek git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16290 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf index f163de3d3f..a95e1e730c 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf @@ -39,8 +39,7 @@ Ia32/IoLibExAsm.nasm [Sources.X64] - X64/IoLibExAsm.asm - X64/IoLibExAsm.S + X64/IoLibExAsm.nasm [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf index 5c5c5c7f40..03a659c9b0 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf @@ -37,8 +37,7 @@ Ia32/IoLibExAsm.nasm [Sources.X64] - X64/IoLibExAsm.asm - X64/IoLibExAsm.S + X64/IoLibExAsm.nasm [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.S b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.S deleted file mode 100644 index 69167b7081..0000000000 --- a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.S +++ /dev/null @@ -1,47 +0,0 @@ -#------------------------------------------------------------------------------ -# -# 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. -# -#------------------------------------------------------------------------------ - -#------------------------------------------------------------------------------ -# VOID -# EFIAPI -# IoReadFifo8 ( -# IN UINTN Port, // rcx -# IN UINTN Size, // rdx -# IN VOID *Buffer // r8 -# ); -#------------------------------------------------------------------------------ -ASM_GLOBAL ASM_PFX(IoReadFifo8) -ASM_PFX(IoReadFifo8): - xchg %rcx, %rdx - xchg %r8, %rdi # rdi: buffer address; r8: save rdi -rep insb - mov %r8, %rdi # restore rdi - ret - -#------------------------------------------------------------------------------ -# VOID -# EFIAPI -# IoWriteFifo8 ( -# IN UINTN Port, // rcx -# IN UINTN Size, // rdx -# IN VOID *Buffer // r8 -# ); -#------------------------------------------------------------------------------ -ASM_GLOBAL ASM_PFX(IoWriteFifo8) -ASM_PFX(IoWriteFifo8): - xchg %rcx, %rdx - xchg %r8, %rsi # rdi: buffer address; r8: save rsi -rep outsb - mov %r8, %rsi # restore rsi - ret - diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.asm b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.asm deleted file mode 100644 index 47ac158f85..0000000000 --- a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.asm +++ /dev/null @@ -1,56 +0,0 @@ -;------------------------------------------------------------------------------ -; -; 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. -; -;------------------------------------------------------------------------------ - - .code - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoReadFifo8 PROC - - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insb - mov rdi, r8 ; restore rdi - ret - -IoReadFifo8 ENDP - - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoWriteFifo8 PROC - - xchg rcx, rdx - xchg rsi, r8 ; rdi: buffer address; r8: save rdi -rep outsb - mov rsi, r8 ; restore rdi - ret - -IoWriteFifo8 ENDP - - END - diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm new file mode 100644 index 0000000000..f1078f2088 --- /dev/null +++ b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm @@ -0,0 +1,52 @@ +;------------------------------------------------------------------------------ +; +; 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. +; +;------------------------------------------------------------------------------ + + DEFAULT REL + SECTION .text + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo8 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo8) +ASM_PFX(IoReadFifo8): + + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi +rep insb + mov rdi, r8 ; restore rdi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo8 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo8) +ASM_PFX(IoWriteFifo8): + + xchg rcx, rdx + xchg rsi, r8 ; rdi: buffer address; r8: save rdi +rep outsb + mov rsi, r8 ; restore rdi + ret +