diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-10-31 20:54:41 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2014-10-31 20:54:41 +0000 |
| commit | 8a2976125d7f55ca0ef93c88680a4c2abbaa7ca5 (patch) | |
| tree | f64c22e9609f8f830b1104ce9f5aff5733e524b0 | |
| parent | ad8ae98d2fa2f9e2bb1ecd7941fb1b7ccda9fa6f (diff) | |
| download | edk2-8a2976125d7f55ca0ef93c88680a4c2abbaa7ca5.tar.gz edk2-8a2976125d7f55ca0ef93c88680a4c2abbaa7ca5.tar.bz2 edk2-8a2976125d7f55ca0ef93c88680a4c2abbaa7ca5.zip | |
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
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S | 52 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm (renamed from OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.asm) | 17 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 3 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf | 3 |
4 files changed, 7 insertions, 68 deletions
diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S deleted file mode 100644 index c2735d2c65..0000000000 --- a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.S +++ /dev/null @@ -1,52 +0,0 @@ -#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
-# 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,
-# IN UINTN Size,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoReadFifo8)
-ASM_PFX(IoReadFifo8):
- movw 4(%esp), %dx
- movl 8(%esp), %ecx
- pushl %edi
- movl 16(%esp), %edi
-rep insb
- popl %edi
- ret
-
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# IoWriteFifo8 (
-# IN UINTN Port,
-# IN UINTN Size,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoWriteFifo8)
-ASM_PFX(IoWriteFifo8):
- movw 4(%esp), %dx
- movl 8(%esp), %ecx
- pushl %esi
- movl 16(%esp), %esi
-rep outsb
- popl %esi
- ret
-
diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.asm b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm index f7d65c49af..faa22e97d4 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.asm +++ b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm @@ -11,9 +11,7 @@ ;
;------------------------------------------------------------------------------
- .586P
- .model flat,C
- .code
+ SECTION .text
;------------------------------------------------------------------------------
; VOID
@@ -24,7 +22,8 @@ ; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoReadFifo8 PROC
+global ASM_PFX(IoReadFifo8)
+ASM_PFX(IoReadFifo8):
mov dx, [esp + 4]
mov ecx, [esp + 8]
@@ -34,9 +33,6 @@ rep insb pop edi
ret
-IoReadFifo8 ENDP
-
-
;------------------------------------------------------------------------------
; VOID
; EFIAPI
@@ -46,7 +42,8 @@ IoReadFifo8 ENDP ; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoWriteFifo8 PROC
+global ASM_PFX(IoWriteFifo8)
+ASM_PFX(IoWriteFifo8):
mov dx, [esp + 4]
mov ecx, [esp + 8]
@@ -56,7 +53,3 @@ rep outsb pop esi
ret
-IoWriteFifo8 ENDP
-
- END
-
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf index 071737edef..f163de3d3f 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf @@ -36,8 +36,7 @@ QemuFwCfgPeiDxe.c
[Sources.IA32]
- Ia32/IoLibExAsm.asm
- Ia32/IoLibExAsm.S
+ Ia32/IoLibExAsm.nasm
[Sources.X64]
X64/IoLibExAsm.asm
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf index 71beacbaf9..5c5c5c7f40 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf @@ -34,8 +34,7 @@ QemuFwCfgSec.c
[Sources.IA32]
- Ia32/IoLibExAsm.asm
- Ia32/IoLibExAsm.S
+ Ia32/IoLibExAsm.nasm
[Sources.X64]
X64/IoLibExAsm.asm
|