summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.S134
-rw-r--r--OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.nasm (renamed from OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.asm)30
-rw-r--r--OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf3
3 files changed, 14 insertions, 153 deletions
diff --git a/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.S b/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.S
deleted file mode 100644
index 03a014d..0000000
--- a/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.S
+++ /dev/null
@@ -1,134 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006 - 2012, 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 Count,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoReadFifo8)
-ASM_PFX(IoReadFifo8):
- push %edi
- cld
- movw 8(%esp), %dx
- mov 12(%esp), %ecx
- mov 16(%esp), %edi
-rep insb
- pop %edi
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# IoReadFifo16 (
-# IN UINTN Port,
-# IN UINTN Count,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoReadFifo16)
-ASM_PFX(IoReadFifo16):
- push %edi
- cld
- movw 8(%esp), %dx
- mov 12(%esp), %ecx
- mov 16(%esp), %edi
-rep insw
- pop %edi
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# IoReadFifo32 (
-# IN UINTN Port,
-# IN UINTN Count,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoReadFifo32)
-ASM_PFX(IoReadFifo32):
- push %edi
- cld
- movw 8(%esp), %dx
- mov 12(%esp), %ecx
- mov 16(%esp), %edi
-rep insl
- pop %edi
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# IoWriteFifo8 (
-# IN UINTN Port,
-# IN UINTN Count,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoWriteFifo8)
-ASM_PFX(IoWriteFifo8):
- push %esi
- cld
- movw 8(%esp), %dx
- mov 12(%esp), %ecx
- mov 16(%esp), %esi
-rep outsb
- pop %esi
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# IoWriteFifo16 (
-# IN UINTN Port,
-# IN UINTN Count,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoWriteFifo16)
-ASM_PFX(IoWriteFifo16):
- push %esi
- cld
- movw 8(%esp), %dx
- mov 12(%esp), %ecx
- mov 16(%esp), %esi
-rep outsw
- pop %esi
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# IoWriteFifo32 (
-# IN UINTN Port,
-# IN UINTN Count,
-# IN VOID *Buffer
-# );
-#------------------------------------------------------------------------------
-ASM_GLOBAL ASM_PFX(IoWriteFifo32)
-ASM_PFX(IoWriteFifo32):
- push %esi
- cld
- movw 8(%esp), %dx
- mov 12(%esp), %ecx
- mov 16(%esp), %esi
-rep outsl
- pop %esi
- ret
-
diff --git a/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.asm b/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.nasm
index b1cc25e..daa90a9 100644
--- a/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.asm
+++ b/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.nasm
@@ -12,9 +12,7 @@
;
;------------------------------------------------------------------------------
- .586P
- .model flat,C
- .code
+ SECTION .text
;------------------------------------------------------------------------------
; VOID
@@ -25,7 +23,8 @@
; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoReadFifo8 PROC
+global ASM_PFX(IoReadFifo8)
+ASM_PFX(IoReadFifo8):
push edi
cld
mov dx, [esp + 8]
@@ -34,7 +33,6 @@ IoReadFifo8 PROC
rep insb
pop edi
ret
-IoReadFifo8 ENDP
;------------------------------------------------------------------------------
; VOID
@@ -45,7 +43,8 @@ IoReadFifo8 ENDP
; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoReadFifo16 PROC
+global ASM_PFX(IoReadFifo16)
+ASM_PFX(IoReadFifo16):
push edi
cld
mov dx, [esp + 8]
@@ -54,7 +53,6 @@ IoReadFifo16 PROC
rep insw
pop edi
ret
-IoReadFifo16 ENDP
;------------------------------------------------------------------------------
; VOID
@@ -65,7 +63,8 @@ IoReadFifo16 ENDP
; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoReadFifo32 PROC
+global ASM_PFX(IoReadFifo32)
+ASM_PFX(IoReadFifo32):
push edi
cld
mov dx, [esp + 8]
@@ -74,7 +73,6 @@ IoReadFifo32 PROC
rep insd
pop edi
ret
-IoReadFifo32 ENDP
;------------------------------------------------------------------------------
; VOID
@@ -85,7 +83,8 @@ IoReadFifo32 ENDP
; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoWriteFifo8 PROC
+global ASM_PFX(IoWriteFifo8)
+ASM_PFX(IoWriteFifo8):
push esi
cld
mov dx, [esp + 8]
@@ -94,7 +93,6 @@ IoWriteFifo8 PROC
rep outsb
pop esi
ret
-IoWriteFifo8 ENDP
;------------------------------------------------------------------------------
; VOID
@@ -105,7 +103,8 @@ IoWriteFifo8 ENDP
; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoWriteFifo16 PROC
+global ASM_PFX(IoWriteFifo16)
+ASM_PFX(IoWriteFifo16):
push esi
cld
mov dx, [esp + 8]
@@ -114,7 +113,6 @@ IoWriteFifo16 PROC
rep outsw
pop esi
ret
-IoWriteFifo16 ENDP
;------------------------------------------------------------------------------
; VOID
@@ -125,7 +123,8 @@ IoWriteFifo16 ENDP
; IN VOID *Buffer
; );
;------------------------------------------------------------------------------
-IoWriteFifo32 PROC
+global ASM_PFX(IoWriteFifo32)
+ASM_PFX(IoWriteFifo32):
push esi
cld
mov dx, [esp + 8]
@@ -134,7 +133,4 @@ IoWriteFifo32 PROC
rep outsd
pop esi
ret
-IoWriteFifo32 ENDP
-
- END
diff --git a/OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf b/OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
index ca760b5..5ef1ef6 100644
--- a/OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
@@ -49,8 +49,7 @@
IoFifo.h
[Sources.IA32]
- Ia32/IoFifo.asm
- Ia32/IoFifo.S
+ Ia32/IoFifo.nasm
[Sources.X64]
X64/IoFifo.asm
generated by cgit v1.1 at 2024-11-14 19:01:40 +0000