Revision: 16315
http://sourceforge.net/p/edk2/code/16315
Author: jljusten
Date: 2014-11-08 02:40:58 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
OvmfPkg XenBusDxe: Convert Ia32/InterlockedCompareExchange16.asm to NASM
The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/InterlockedCompareExchange16.asm to Ia32/InterlockedCompareExchange16.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/Ia32/InterlockedCompareExchange16.nasm
Removed Paths:
-------------
trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S
trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm
Deleted: trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S
2014-11-08 02:40:44 UTC (rev 16314)
+++ trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S
2014-11-08 02:40:58 UTC (rev 16315)
@@ -1,15 +0,0 @@
-# UINT16
-# EFIAPI
-# InternalSyncCompareExchange16 (
-# IN volatile UINT16 *Value,
-# IN UINT16 CompareValue,
-# IN UINT16 ExchangeValue
-# );
-ASM_GLOBAL ASM_PFX(InternalSyncCompareExchange16)
-ASM_PFX(InternalSyncCompareExchange16):
- mov 4(%esp), %ecx
- mov 8(%esp), %eax
- mov 12(%esp), %edx
- lock
- cmpxchgw %dx, (%ecx)
- ret
Deleted: trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm
2014-11-08 02:40:44 UTC (rev 16314)
+++ trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm
2014-11-08 02:40:58 UTC (rev 16315)
@@ -1,45 +0,0 @@
-;------------------------------------------------------------------------------
-;
-; Copyright (c) 2006, 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.
-;
-; Module Name:
-;
-; InterlockedCompareExchange16.Asm
-;
-; Abstract:
-;
-; InterlockedCompareExchange16 function
-;
-; Notes:
-;
-;------------------------------------------------------------------------------
-
- .486
- .model flat,C
- .code
-
-;------------------------------------------------------------------------------
-; UINT32
-; EFIAPI
-; InternalSyncCompareExchange16 (
-; IN UINT16 *Value,
-; IN UINT16 CompareValue,
-; IN UINT16 ExchangeValue
-; );
-;------------------------------------------------------------------------------
-InternalSyncCompareExchange16 PROC
- mov ecx, [esp + 4]
- mov eax, [esp + 8]
- mov edx, [esp + 12]
- lock cmpxchg [ecx], dx
- ret
-InternalSyncCompareExchange16 ENDP
-
- END
Copied: trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.nasm
(from rev 16314,
trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm)
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.nasm
(rev 0)
+++ trunk/edk2/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.nasm
2014-11-08 02:40:58 UTC (rev 16315)
@@ -0,0 +1,42 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006, 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.
+;
+; Module Name:
+;
+; InterlockedCompareExchange16.Asm
+;
+; Abstract:
+;
+; InterlockedCompareExchange16 function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+ SECTION .text
+
+;------------------------------------------------------------------------------
+; UINT32
+; EFIAPI
+; InternalSyncCompareExchange16 (
+; IN UINT16 *Value,
+; IN UINT16 CompareValue,
+; IN UINT16 ExchangeValue
+; );
+;------------------------------------------------------------------------------
+global ASM_PFX(InternalSyncCompareExchange16)
+ASM_PFX(InternalSyncCompareExchange16):
+ mov ecx, [esp + 4]
+ mov eax, [esp + 8]
+ mov edx, [esp + 12]
+ lock cmpxchg [ecx], dx
+ ret
+
Modified: trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf 2014-11-08 02:40:44 UTC (rev
16314)
+++ trunk/edk2/OvmfPkg/XenBusDxe/XenBusDxe.inf 2014-11-08 02:40:58 UTC (rev
16315)
@@ -50,8 +50,7 @@
[Sources.IA32]
Ia32/hypercall.nasm
- Ia32/InterlockedCompareExchange16.S
- Ia32/InterlockedCompareExchange16.asm
+ Ia32/InterlockedCompareExchange16.nasm
Ia32/TestAndClearBit.S
Ia32/TestAndClearBit.asm
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
