OvmfPkg XenBusDxe: Convert X64/TestAndClearBit.asm to NASM

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

diff --git a/OvmfPkg/XenBusDxe/X64/TestAndClearBit.S b/OvmfPkg/XenBusDxe/X64/TestAndClearBit.S
deleted file mode 100644 (file)
index 0372e83..0000000
--- a/OvmfPkg/XenBusDxe/X64/TestAndClearBit.S
+++ /dev/null
@@ -1,12 +0,0 @@
-# INT32\r
-# EFIAPI\r
-# TestAndClearBit (\r
-#   IN  INT32 Bit,                // rcx\r
-#   IN  volatile VOID* Address    // rdx\r
-#   );\r
-ASM_GLOBAL ASM_PFX(TestAndClearBit)\r
-ASM_PFX(TestAndClearBit):\r
-  lock\r
-  btrl %ecx, (%rdx)\r
-  sbbl %eax, %eax\r
-  ret\r

diff --git a/OvmfPkg/XenBusDxe/X64/TestAndClearBit.asm b/OvmfPkg/XenBusDxe/X64/TestAndClearBit.asm
deleted file mode 100644 (file)
index 3a25879..0000000
--- a/OvmfPkg/XenBusDxe/X64/TestAndClearBit.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-.code\r
-\r
-; INT32\r
-; EFIAPI\r
-; TestAndClearBit (\r
-;   IN  INT32 Bit,                // rcx\r
-;   IN  volatile VOID* Address    // rdx\r
-;   );\r
-TestAndClearBit PROC\r
-  lock\r
-  btr [rdx], ecx\r
-  sbb eax, eax\r
-  ret\r
-TestAndClearBit ENDP\r
-\r
-END\r

diff --git a/OvmfPkg/XenBusDxe/X64/TestAndClearBit.nasm b/OvmfPkg/XenBusDxe/X64/TestAndClearBit.nasm
new file mode 100644 (file)
index 0000000..38ac549
--- /dev/null
+++ b/OvmfPkg/XenBusDxe/X64/TestAndClearBit.nasm
@@ -0,0 +1,16 @@
+DEFAULT REL\r
+SECTION .text\r
+\r
+; INT32\r
+; EFIAPI\r
+; TestAndClearBit (\r
+;   IN  INT32 Bit,                // rcx\r
+;   IN  volatile VOID* Address    // rdx\r
+;   );\r
+global ASM_PFX(TestAndClearBit)\r
+ASM_PFX(TestAndClearBit):\r
+  lock\r
+  btr [rdx], ecx\r
+  sbb eax, eax\r
+  ret\r
+\r

diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.inf b/OvmfPkg/XenBusDxe/XenBusDxe.inf
index 61f7568e554eff8e1cb109fe9998ac34b929c0da..4ce47434545204e3af9a92d834438509808f0d04 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBusDxe.inf
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.inf
@@ -56,8 +56,7 @@
 [Sources.X64]\r
   X64/hypercall.nasm\r
   X64/InterlockedCompareExchange16.nasm\r
-  X64/TestAndClearBit.S\r
-  X64/TestAndClearBit.asm\r
+  X64/TestAndClearBit.nasm\r
 \r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r