Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 06:15:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
Patch by Thomas Faber:
Fix broken interlocked functions

See issue #6374 for more details.

svn path=/trunk/; revision=52735
This commit is contained in:
Timo Kreuzer 2011-07-20 13:48:06 +00:00
parent bbbb4ccf95
commit 825444af66
4 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/ntoskrnl/ex/i386/fastinterlck_asm.S
View file

@ -155,8 +155,8 @@ PUBLIC @ExfInterlockedInsertHeadList@12
/*PLIST_ENTRY
*FASTCALL
*ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead,
* IN PLIST_ENTRY ListEntry,
* IN PKSPIN_LOCK Lock)
* IN PLIST_ENTRY ListEntry,
* IN PKSPIN_LOCK Lock)
*/
PUBLIC @ExfInterlockedInsertTailList@12
@ExfInterlockedInsertTailList@12:
@ -537,7 +537,7 @@ PUBLIC @Exfi386InterlockedDecrementLong@4
/*ULONG
*FASTCALL
*Exfi386InterlockedExchangeUlong(IN PULONG Taget,
*Exfi386InterlockedExchangeUlong(IN PULONG Target,
* IN ULONG Value)
*/
PUBLIC @Exfi386InterlockedExchangeUlong@8
@ -591,16 +591,16 @@ PUBLIC @ExfInterlockedCompareExchange64@12
/*PVOID
*FASTCALL
*ExfInterlockedCompareExchange64(IN PLONGLONG Destination,
* IN PLONGLONG Exchange,
* IN PLONGLONG Comperand,
* IN PKSPIN_LOCK Lock)
*ExInterlockedCompareExchange64(IN PLONGLONG Destination,
* IN PLONGLONG Exchange,
* IN PLONGLONG Comperand,
* IN PKSPIN_LOCK Lock)
*/
PUBLIC @ExInterlockedCompareExchange64@16
@ExInterlockedCompareExchange64@16:
/* Save registers */
push ebp
push ebx
push ebp
/* Get destination pointer, exchange value and comperand value/address */

39
reactos/ntoskrnl/ex/i386/interlck_asm.S
View file

@ -5,7 +5,7 @@
* PURPOSE: STDCALL Interlocked Functions
* PROGRAMMERS: Alex Ionescu (alex@relsoft.net)
*/
/* INCLUDES ******************************************************************/
#include <asm.inc>
@ -26,8 +26,8 @@
/*PLIST_ENTRY
*NTAPI
*ExInterlockedAddLargeInteger(IN PLIST_ENTRY ListHead,
* IN PLIST_ENTRY ListEntry,
*ExInterlockedAddLargeInteger(IN PLARGE_INTEGER Addend,
* IN LARGE_INTEGER Increment,
* IN PKSPIN_LOCK Lock)
*/
PUBLIC _ExInterlockedAddLargeInteger@16
@ -92,9 +92,9 @@ _ExInterlockedAddLargeInteger@16:
/*PLIST_ENTRY
*NTAPI
*ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead,
* IN PLIST_ENTRY ListEntry,
* IN PKSPIN_LOCK Lock)
*ExInterlockedAddUlong(IN PULONG Addend,
* IN ULONG Increment,
* IN PKSPIN_LOCK Lock)
*/
PUBLIC _ExInterlockedAddUlong@12
_ExInterlockedAddUlong@12:
@ -471,14 +471,18 @@ _ExInterlockedDecrementLong@8:
PUBLIC _ExInterlockedExchangeUlong@12
_ExInterlockedExchangeUlong@12:
#ifdef CONFIG_SMP
/* Get pointers */
mov edx, [esp+4]
mov eax, [esp+8]
#ifdef CONFIG_SMP
/* On MP, do the exchange */
xchg [edx], eax
#else
/* Get pointers */
mov edx, [esp+4]
mov ecx, [esp+8]
/* On UP, disable interrupts and save flags */
pushfd
cli
@ -494,8 +498,7 @@ _ExInterlockedExchangeUlong@12:
/*INTERLOCKED_RESULT
*NTAPI
*Exi386InterlockedIncrementLong(IN PLONG Addend,
* IN PKSPIN_LOCK Lock)
*Exi386InterlockedIncrementLong(IN PLONG Addend)
*/
PUBLIC _Exi386InterlockedIncrementLong@4
_Exi386InterlockedIncrementLong@4:
@ -513,8 +516,7 @@ _Exi386InterlockedIncrementLong@4:
/*INTERLOCKED_RESULT
*NTAPI
*Exi386InterlockedDecrementLong(IN PLONG Addend,
* IN PKSPIN_LOCK Lock)
*Exi386InterlockedDecrementLong(IN PLONG Addend)
*/
PUBLIC _Exi386InterlockedDecrementLong@4
_Exi386InterlockedDecrementLong@4:
@ -528,25 +530,28 @@ _Exi386InterlockedDecrementLong@4:
/* Return */
lahf
and eax, EFLAG_SELECT
ret 8
ret 4
/*ULONG
*NTAPI
*Exi386InterlockedExchangeUlong(IN PULONG Target,
* IN ULONG Value,
* IN PKSPIN_LOCK Lock)
* IN ULONG Value)
*/
PUBLIC _Exi386InterlockedExchangeUlong@12
_Exi386InterlockedExchangeUlong@12:
PUBLIC _Exi386InterlockedExchangeUlong@8
_Exi386InterlockedExchangeUlong@8:
#ifdef CONFIG_SMP
/* Get pointers */
mov edx, [esp+4]
mov eax, [esp+8]
#ifdef CONFIG_SMP
/* On MP, do the exchange */
xchg [edx], eax
#else
/* Get pointers */
mov edx, [esp+4]
mov ecx, [esp+8]
/* On UP, disable interrupts and save flags */
pushfd
cli

2
reactos/ntoskrnl/ntoskrnl.pspec
View file

@ -198,7 +198,7 @@
@ FASTCALL -arch=i386 Exfi386InterlockedExchangeUlong(ptr long)
@ FASTCALL -arch=i386 Exfi386InterlockedIncrementLong(ptr)
@ stdcall -arch=i386 Exi386InterlockedDecrementLong(ptr)
@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long long)
@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long)
@ stdcall -arch=i386 Exi386InterlockedIncrementLong(ptr)
@ FASTCALL -arch=i386 ExiAcquireFastMutex(ptr) ExAcquireFastMutex
@ FASTCALL -arch=i386 ExiReleaseFastMutex(ptr) ExReleaseFastMutex

2
reactos/ntoskrnl/ntoskrnl.spec
View file

@ -178,7 +178,7 @@
@ fastcall -arch=i386 Exfi386InterlockedExchangeUlong(ptr long)
@ fastcall -arch=i386 Exfi386InterlockedIncrementLong(ptr)
@ stdcall -arch=i386 Exi386InterlockedDecrementLong(ptr)
@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long long)
@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long)
@ stdcall -arch=i386 Exi386InterlockedIncrementLong(ptr)
@ fastcall -arch=i386 ExiAcquireFastMutex(ptr) ExAcquireFastMutex
@ fastcall -arch=i386 ExiReleaseFastMutex(ptr) ExReleaseFastMutex