diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2014-11-08 02:40:44 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2014-11-08 02:40:44 +0000 |
| commit | 8e7ca01de038f0f4ee3df8fabf0caa2eb804379c (patch) | |
| tree | aeafc1152404937004d0a79439759e4a35f46b2a /OvmfPkg/XenBusDxe | |
| parent | 16a5fed65808adf648004b34f98718301d718fa2 (diff) | |
| download | edk2-8e7ca01de038f0f4ee3df8fabf0caa2eb804379c.tar.gz edk2-8e7ca01de038f0f4ee3df8fabf0caa2eb804379c.tar.bz2 edk2-8e7ca01de038f0f4ee3df8fabf0caa2eb804379c.zip | |
OvmfPkg XenBusDxe: Convert Ia32/hypercall.asm to NASM
The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/hypercall.asm to Ia32/hypercall.nasm
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16314 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg/XenBusDxe')
| -rw-r--r-- | OvmfPkg/XenBusDxe/Ia32/hypercall.S | 22 | ||||
| -rw-r--r-- | OvmfPkg/XenBusDxe/Ia32/hypercall.nasm (renamed from OvmfPkg/XenBusDxe/Ia32/hypercall.asm) | 7 | ||||
| -rw-r--r-- | OvmfPkg/XenBusDxe/XenBusDxe.inf | 3 |
3 files changed, 4 insertions, 28 deletions
diff --git a/OvmfPkg/XenBusDxe/Ia32/hypercall.S b/OvmfPkg/XenBusDxe/Ia32/hypercall.S deleted file mode 100644 index 77d3478475..0000000000 --- a/OvmfPkg/XenBusDxe/Ia32/hypercall.S +++ /dev/null @@ -1,22 +0,0 @@ -# INTN
-# EFIAPI
-# XenHypercall2 (
-# IN VOID *HypercallAddr,
-# IN OUT INTN Arg1,
-# IN OUT INTN Arg2
-# );
-ASM_GLOBAL ASM_PFX(XenHypercall2)
-ASM_PFX(XenHypercall2):
- # Save only ebx, ecx is supposed to be a scratch register and needs to be
- # saved by the caller
- push %ebx
- # Copy HypercallAddr to eax
- mov 8(%esp), %eax
- # Copy Arg1 to the register expected by Xen
- mov 12(%esp), %ebx
- # Copy Arg2 to the register expected by Xen
- mov 16(%esp), %ecx
- # Call HypercallAddr
- call *%eax
- pop %ebx
- ret
diff --git a/OvmfPkg/XenBusDxe/Ia32/hypercall.asm b/OvmfPkg/XenBusDxe/Ia32/hypercall.nasm index 9ead740f91..8547c30b81 100644 --- a/OvmfPkg/XenBusDxe/Ia32/hypercall.asm +++ b/OvmfPkg/XenBusDxe/Ia32/hypercall.nasm @@ -1,4 +1,4 @@ -.code
+SECTION .text
; INTN
; EFIAPI
@@ -7,7 +7,8 @@ ; IN OUT INTN Arg1,
; IN OUT INTN Arg2
; );
-XenHypercall2 PROC
+global ASM_PFX(XenHypercall2)
+ASM_PFX(XenHypercall2):
; Save only ebx, ecx is supposed to be a scratch register and needs to be
; saved by the caller
push ebx
@@ -21,6 +22,4 @@ XenHypercall2 PROC call eax
pop ebx
ret
-XenHypercall2 ENDP
-END
diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.inf b/OvmfPkg/XenBusDxe/XenBusDxe.inf index 17a5a9073a..2478e35b63 100644 --- a/OvmfPkg/XenBusDxe/XenBusDxe.inf +++ b/OvmfPkg/XenBusDxe/XenBusDxe.inf @@ -49,8 +49,7 @@ Helpers.c
[Sources.IA32]
- Ia32/hypercall.S
- Ia32/hypercall.asm
+ Ia32/hypercall.nasm
Ia32/InterlockedCompareExchange16.S
Ia32/InterlockedCompareExchange16.asm
Ia32/TestAndClearBit.S
|