Revision: 16317
http://sourceforge.net/p/edk2/code/16317
Author: jljusten
Date: 2014-11-08 02:41:15 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
OvmfPkg XenBusDxe: Convert X64/hypercall.asm to NASM
The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
X64/hypercall.asm to X64/hypercall.nasm
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Anthony PERARD <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf
Added Paths:
-----------
trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.nasm
Removed Paths:
-------------
trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.S
trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.asm
Deleted: trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.S
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.S 2014-11-08 02:41:07 UTC
(rev 16316)
+++ trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.S 2014-11-08 02:41:15 UTC
(rev 16317)
@@ -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):
- push %rdi
- push %rsi
- # Copy HypercallAddr to rax
- movq %rcx, %rax
- # Copy Arg1 to the register expected by Xen
- movq %rdx, %rdi
- # Copy Arg2 to the register expected by Xen
- movq %r8, %rsi
- # Call HypercallAddr
- call *%rax
- pop %rsi
- pop %rdi
- ret
Deleted: trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.asm
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.asm 2014-11-08 02:41:07 UTC
(rev 16316)
+++ trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.asm 2014-11-08 02:41:15 UTC
(rev 16317)
@@ -1,26 +0,0 @@
-.code
-
-; INTN
-; EFIAPI
-; XenHypercall2 (
-; IN VOID *HypercallAddr,
-; IN OUT INTN Arg1,
-; IN OUT INTN Arg2
-; );
-XenHypercall2 PROC
- push rdi
- push rsi
- ; Copy HypercallAddr to rax
- mov rax, rcx
- ; Copy Arg1 to the register expected by Xen
- mov rdi, rdx
- ; Copy Arg2 to the register expected by Xen
- mov rsi, r8
- ; Call HypercallAddr
- call rax
- pop rsi
- pop rdi
- ret
-XenHypercall2 ENDP
-
-END
Copied: trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.nasm (from rev 16316,
trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.asm)
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.nasm
(rev 0)
+++ trunk/edk2/OvmfPkg/XenBusDxe/X64/hypercall.nasm 2014-11-08 02:41:15 UTC
(rev 16317)
@@ -0,0 +1,26 @@
+DEFAULT REL
+SECTION .text
+
+; INTN
+; EFIAPI
+; XenHypercall2 (
+; IN VOID *HypercallAddr,
+; IN OUT INTN Arg1,
+; IN OUT INTN Arg2
+; );
+global ASM_PFX(XenHypercall2)
+ASM_PFX(XenHypercall2):
+ push rdi
+ push rsi
+ ; Copy HypercallAddr to rax
+ mov rax, rcx
+ ; Copy Arg1 to the register expected by Xen
+ mov rdi, rdx
+ ; Copy Arg2 to the register expected by Xen
+ mov rsi, r8
+ ; Call HypercallAddr
+ call rax
+ pop rsi
+ pop rdi
+ ret
+
Modified: trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf 2014-11-08 02:41:07 UTC (rev
16316)
+++ trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf 2014-11-08 02:41:15 UTC (rev
16317)
@@ -54,8 +54,7 @@
Ia32/TestAndClearBit.nasm
[Sources.X64]
- X64/hypercall.S
- X64/hypercall.asm
+ X64/hypercall.nasm
X64/InterlockedCompareExchange16.S
X64/InterlockedCompareExchange16.asm
X64/TestAndClearBit.S
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
