OvmfPkg QemuFwCfgLib: Convert Ia32/IoLibExAsm.asm to NASM

The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/IoLibExAsm.asm to Ia32/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@16289 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S
deleted file mode 100644 (file)
index c2735d2..0000000
--- a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S
+++ /dev/null
@@ -1,52 +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,\r
-#    IN UINTN                  Size,\r
-#    IN VOID                   *Buffer\r
-#    );\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(IoReadFifo8)\r
-ASM_PFX(IoReadFifo8):\r
-    movw    4(%esp), %dx\r
-    movl    8(%esp), %ecx\r
-    pushl   %edi\r
-    movl    16(%esp), %edi\r
-rep insb\r
-    popl    %edi\r
-    ret\r
-\r
-\r
-#------------------------------------------------------------------------------\r
-#  VOID\r
-#  EFIAPI\r
-#  IoWriteFifo8 (\r
-#    IN UINTN                  Port,\r
-#    IN UINTN                  Size,\r
-#    IN VOID                   *Buffer\r
-#    );\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(IoWriteFifo8)\r
-ASM_PFX(IoWriteFifo8):\r
-    movw    4(%esp), %dx\r
-    movl    8(%esp), %ecx\r
-    pushl   %esi\r
-    movl    16(%esp), %esi\r
-rep outsb\r
-    popl    %esi\r
-    ret\r
-\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.asm b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.asm
deleted file mode 100644 (file)
index f7d65c4..0000000
--- a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.asm
+++ /dev/null
@@ -1,62 +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
-    .586P\r
-    .model  flat,C\r
-    .code\r
-\r
-;------------------------------------------------------------------------------\r
-;  VOID\r
-;  EFIAPI\r
-;  IoReadFifo8 (\r
-;    IN UINTN                  Port,\r
-;    IN UINTN                  Size,\r
-;    IN VOID                   *Buffer\r
-;    );\r
-;------------------------------------------------------------------------------\r
-IoReadFifo8 PROC\r
-\r
-    mov     dx, [esp + 4]\r
-    mov     ecx, [esp + 8]\r
-    push    edi\r
-    mov     edi, [esp + 16]\r
-rep insb\r
-    pop     edi\r
-    ret\r
-\r
-IoReadFifo8 ENDP\r
-\r
-\r
-;------------------------------------------------------------------------------\r
-;  VOID\r
-;  EFIAPI\r
-;  IoWriteFifo8 (\r
-;    IN UINTN                  Port,\r
-;    IN UINTN                  Size,\r
-;    IN VOID                   *Buffer\r
-;    );\r
-;------------------------------------------------------------------------------\r
-IoWriteFifo8 PROC\r
-\r
-    mov     dx, [esp + 4]\r
-    mov     ecx, [esp + 8]\r
-    push    esi\r
-    mov     esi, [esp + 16]\r
-rep outsb\r
-    pop     esi\r
-    ret\r
-\r
-IoWriteFifo8 ENDP\r
-\r
-    END\r
-\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm
new file mode 100644 (file)
index 0000000..faa22e9
--- /dev/null
+++ b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm
@@ -0,0 +1,55 @@
+;------------------------------------------------------------------------------\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
+    SECTION .text\r
+\r
+;------------------------------------------------------------------------------\r
+;  VOID\r
+;  EFIAPI\r
+;  IoReadFifo8 (\r
+;    IN UINTN                  Port,\r
+;    IN UINTN                  Size,\r
+;    IN VOID                   *Buffer\r
+;    );\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(IoReadFifo8)\r
+ASM_PFX(IoReadFifo8):\r
+\r
+    mov     dx, [esp + 4]\r
+    mov     ecx, [esp + 8]\r
+    push    edi\r
+    mov     edi, [esp + 16]\r
+rep insb\r
+    pop     edi\r
+    ret\r
+\r
+;------------------------------------------------------------------------------\r
+;  VOID\r
+;  EFIAPI\r
+;  IoWriteFifo8 (\r
+;    IN UINTN                  Port,\r
+;    IN UINTN                  Size,\r
+;    IN VOID                   *Buffer\r
+;    );\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(IoWriteFifo8)\r
+ASM_PFX(IoWriteFifo8):\r
+\r
+    mov     dx, [esp + 4]\r
+    mov     ecx, [esp + 8]\r
+    push    esi\r
+    mov     esi, [esp + 16]\r
+rep outsb\r
+    pop     esi\r
+    ret\r
+\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
index 071737edef2d04868508ab4e723b20ea85adc8e2..f163de3d3fba3ae811a774b1b6e737bcf61cfa83 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
@@ -36,8 +36,7 @@
   QemuFwCfgPeiDxe.c\r
 \r
 [Sources.IA32]\r
-  Ia32/IoLibExAsm.asm\r
-  Ia32/IoLibExAsm.S\r
+  Ia32/IoLibExAsm.nasm\r
 \r
 [Sources.X64]\r
   X64/IoLibExAsm.asm\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf
index 71beacbaf96941f85977baf3503d17872033ecb2..5c5c5c7f408f2ea6ce5d077b909b5da01082e127 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf
@@ -34,8 +34,7 @@
   QemuFwCfgSec.c\r
 \r
 [Sources.IA32]\r
-  Ia32/IoLibExAsm.asm\r
-  Ia32/IoLibExAsm.S\r
+  Ia32/IoLibExAsm.nasm\r
 \r
 [Sources.X64]\r
   X64/IoLibExAsm.asm\r