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 <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
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 f163de3d3fba3ae811a774b1b6e737bcf61cfa83..a95e1e730c2c130ecb18954e586e3cecc409f5cf 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
@@ -39,8 +39,7 @@
   Ia32/IoLibExAsm.nasm\r
 \r
 [Sources.X64]\r
-  X64/IoLibExAsm.asm\r
-  X64/IoLibExAsm.S\r
+  X64/IoLibExAsm.nasm\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf
index 5c5c5c7f408f2ea6ce5d077b909b5da01082e127..03a659c9b082f0be81891a16ce9fb061b85bf41f 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf
@@ -37,8 +37,7 @@
   Ia32/IoLibExAsm.nasm\r
 \r
 [Sources.X64]\r
-  X64/IoLibExAsm.asm\r
-  X64/IoLibExAsm.S\r
+  X64/IoLibExAsm.nasm\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.S b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.S
deleted file mode 100644 (file)
index 69167b7..0000000
--- a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.S
+++ /dev/null
@@ -1,47 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2006 - 2013, 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
-#------------------------------------------------------------------------------\r
-\r
-#------------------------------------------------------------------------------\r
-#  VOID\r
-#  EFIAPI\r
-#  IoReadFifo8 (\r
-#    IN UINTN                  Port,              // rcx\r
-#    IN UINTN                  Size,              // rdx\r
-#    IN VOID                   *Buffer            // r8\r
-#    );\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(IoReadFifo8)\r
-ASM_PFX(IoReadFifo8):\r
-    xchg    %rcx, %rdx\r
-    xchg    %r8, %rdi           # rdi: buffer address; r8: save rdi\r
-rep insb\r
-    mov     %r8, %rdi           # restore rdi\r
-    ret\r
-\r
-#------------------------------------------------------------------------------\r
-#  VOID\r
-#  EFIAPI\r
-#  IoWriteFifo8 (\r
-#    IN UINTN                  Port,              // rcx\r
-#    IN UINTN                  Size,              // rdx\r
-#    IN VOID                   *Buffer            // r8\r
-#    );\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(IoWriteFifo8)\r
-ASM_PFX(IoWriteFifo8):\r
-    xchg    %rcx, %rdx\r
-    xchg    %r8, %rsi           # rdi: buffer address; r8: save rsi\r
-rep outsb\r
-    mov     %r8, %rsi           # restore rsi\r
-    ret\r
-\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.asm b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.asm
deleted file mode 100644 (file)
index 47ac158..0000000
--- a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.asm
+++ /dev/null
@@ -1,56 +0,0 @@
-;------------------------------------------------------------------------------\r
-;\r
-; Copyright (c) 2006 - 2013, 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
-;------------------------------------------------------------------------------\r
-\r
-    .code\r
-\r
-;------------------------------------------------------------------------------\r
-;  VOID\r
-;  EFIAPI\r
-;  IoReadFifo8 (\r
-;    IN UINTN                  Port,              // rcx\r
-;    IN UINTN                  Size,              // rdx\r
-;    IN VOID                   *Buffer            // r8\r
-;    );\r
-;------------------------------------------------------------------------------\r
-IoReadFifo8 PROC\r
-\r
-    xchg    rcx, rdx\r
-    xchg    rdi, r8             ; rdi: buffer address; r8: save rdi\r
-rep insb\r
-    mov     rdi, r8             ; restore rdi\r
-    ret\r
-\r
-IoReadFifo8 ENDP\r
-\r
-\r
-;------------------------------------------------------------------------------\r
-;  VOID\r
-;  EFIAPI\r
-;  IoWriteFifo8 (\r
-;    IN UINTN                  Port,              // rcx\r
-;    IN UINTN                  Size,              // rdx\r
-;    IN VOID                   *Buffer            // r8\r
-;    );\r
-;------------------------------------------------------------------------------\r
-IoWriteFifo8 PROC\r
-\r
-    xchg    rcx, rdx\r
-    xchg    rsi, r8             ; rdi: buffer address; r8: save rdi\r
-rep outsb\r
-    mov     rsi, r8             ; restore rdi\r
-    ret\r
-\r
-IoWriteFifo8 ENDP\r
-\r
-    END\r
-\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm
new file mode 100644 (file)
index 0000000..f1078f2
--- /dev/null
+++ b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm
@@ -0,0 +1,52 @@
+;------------------------------------------------------------------------------\r
+;\r
+; Copyright (c) 2006 - 2013, 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
+;------------------------------------------------------------------------------\r
+\r
+    DEFAULT REL\r
+    SECTION .text\r
+\r
+;------------------------------------------------------------------------------\r
+;  VOID\r
+;  EFIAPI\r
+;  IoReadFifo8 (\r
+;    IN UINTN                  Port,              // rcx\r
+;    IN UINTN                  Size,              // rdx\r
+;    IN VOID                   *Buffer            // r8\r
+;    );\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(IoReadFifo8)\r
+ASM_PFX(IoReadFifo8):\r
+\r
+    xchg    rcx, rdx\r
+    xchg    rdi, r8             ; rdi: buffer address; r8: save rdi\r
+rep insb\r
+    mov     rdi, r8             ; restore rdi\r
+    ret\r
+\r
+;------------------------------------------------------------------------------\r
+;  VOID\r
+;  EFIAPI\r
+;  IoWriteFifo8 (\r
+;    IN UINTN                  Port,              // rcx\r
+;    IN UINTN                  Size,              // rdx\r
+;    IN VOID                   *Buffer            // r8\r
+;    );\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(IoWriteFifo8)\r
+ASM_PFX(IoWriteFifo8):\r
+\r
+    xchg    rcx, rdx\r
+    xchg    rsi, r8             ; rdi: buffer address; r8: save rdi\r
+rep outsb\r
+    mov     rsi, r8             ; restore rdi\r
+    ret\r
+\r