diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2014-11-08 02:41:07 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2014-11-08 02:41:07 +0000 |
| commit | 31c0aa2fd09b9ca7764ae43458d379995baa8637 (patch) | |
| tree | dd81ec68d1bcefe5cd1fd2e6fc108e7e0336c69f | |
| parent | 09c3757bc429b3066133a87ad8271e21fad46518 (diff) | |
| download | edk2-31c0aa2fd09b9ca7764ae43458d379995baa8637.tar.gz edk2-31c0aa2fd09b9ca7764ae43458d379995baa8637.tar.bz2 edk2-31c0aa2fd09b9ca7764ae43458d379995baa8637.zip | |
OvmfPkg XenBusDxe: Convert Ia32/TestAndClearBit.asm to NASM
The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/TestAndClearBit.asm to Ia32/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@16316 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.S | 13 | ||||
| -rw-r--r-- | OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.nasm (renamed from OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.asm) | 7 | ||||
| -rw-r--r-- | OvmfPkg/XenBusDxe/XenBusDxe.inf | 3 |
3 files changed, 4 insertions, 19 deletions
diff --git a/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.S b/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.S deleted file mode 100644 index 58dfa8ba57..0000000000 --- a/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.S +++ /dev/null @@ -1,13 +0,0 @@ -# INT32
-# EFIAPI
-# TestAndClearBit (
-# IN INT32 Bit,
-# IN volatile VOID* Address
-# );
-ASM_GLOBAL ASM_PFX(TestAndClearBit)
-ASM_PFX(TestAndClearBit):
- mov 4(%esp), %ecx
- mov 8(%esp), %edx
- lock btrl %ecx, (%edx)
- sbbl %eax, %eax
- ret
diff --git a/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.asm b/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.nasm index ac809020a6..d77f74ef24 100644 --- a/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.asm +++ b/OvmfPkg/XenBusDxe/Ia32/TestAndClearBit.nasm @@ -1,4 +1,4 @@ -.code
+SECTION .text
; INT32
; EFIAPI
@@ -6,12 +6,11 @@ ; IN INT32 Bit,
; IN volatile VOID* Address
; );
-TestAndClearBit PROC
+global ASM_PFX(TestAndClearBit)
+ASM_PFX(TestAndClearBit):
mov ecx, [esp + 4]
mov edx, [esp + 8]
lock btr [edx], ecx
sbb eax, eax
ret
-TestAndClearBit ENDP
-END
diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.inf b/OvmfPkg/XenBusDxe/XenBusDxe.inf index 292e488387..b421b852e8 100644 --- a/OvmfPkg/XenBusDxe/XenBusDxe.inf +++ b/OvmfPkg/XenBusDxe/XenBusDxe.inf @@ -51,8 +51,7 @@ [Sources.IA32]
Ia32/hypercall.nasm
Ia32/InterlockedCompareExchange16.nasm
- Ia32/TestAndClearBit.S
- Ia32/TestAndClearBit.asm
+ Ia32/TestAndClearBit.nasm
[Sources.X64]
X64/hypercall.S
|