xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Turn atomic routines architecture independent
Some checks failed
Builds / ExectOS (amd64) (push) Successful in 29s
Details
Builds / ExectOS (i686) (push) Failing after 14s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2023-10-29 21:43:05 +01:00
parent 783a4a2aa0
commit 2621cb6d8a
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
xtoskrnl/includes/rtl.h
View File

@ -29,9 +29,9 @@ RtlAtomicAnd32(IN VOLATILE PLONG Address,
IN LONG Mask); IN LONG Mask);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicAnd64(IN VOLATILE PLONGLONG Address, RtlAtomicAnd64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Mask); IN LONG_PTR Mask);
XTFASTCALL XTFASTCALL
CHAR CHAR
@ -52,10 +52,10 @@ RtlAtomicCompareExchange32(IN VOLATILE PLONG Address,
IN LONG Exchange); IN LONG Exchange);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicCompareExchange64(IN VOLATILE PLONGLONG Address, RtlAtomicCompareExchange64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Comperand, IN LONG_PTR Comperand,
IN LONGLONG Exchange); IN LONG_PTR Exchange);
XTFASTCALL XTFASTCALL
PVOID PVOID
@ -76,8 +76,8 @@ LONG
RtlAtomicDecrement32(IN VOLATILE PLONG Address); RtlAtomicDecrement32(IN VOLATILE PLONG Address);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicDecrement64(IN VOLATILE PLONGLONG Address); RtlAtomicDecrement64(IN VOLATILE PLONG_PTR Address);
XTFASTCALL XTFASTCALL
CHAR CHAR
@ -95,9 +95,9 @@ RtlAtomicExchange32(IN VOLATILE PLONG Address,
IN LONG Exchange); IN LONG Exchange);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicExchange64(IN VOLATILE PLONGLONG Address, RtlAtomicExchange64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Exchange); IN LONG_PTR Exchange);
XTFASTCALL XTFASTCALL
CHAR CHAR
@ -115,9 +115,9 @@ RtlAtomicExchangeAdd32(IN VOLATILE PLONG Address,
IN LONG Value); IN LONG Value);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicExchangeAdd64(IN VOLATILE PLONGLONG Address, RtlAtomicExchangeAdd64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Value); IN LONG_PTR Value);
XTFASTCALL XTFASTCALL
PVOID PVOID
@ -141,8 +141,8 @@ LONG
RtlAtomicIncrement32(IN VOLATILE PLONG Address); RtlAtomicIncrement32(IN VOLATILE PLONG Address);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicIncrement64(IN VOLATILE PLONGLONG Address); RtlAtomicIncrement64(IN VOLATILE PLONG_PTR Address);
XTFASTCALL XTFASTCALL
CHAR CHAR
@ -160,9 +160,9 @@ RtlAtomicOr32(IN VOLATILE PLONG Address,
IN LONG Mask); IN LONG Mask);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicOr64(IN VOLATILE PLONGLONG Address, RtlAtomicOr64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Mask); IN LONG_PTR Mask);
XTFASTCALL XTFASTCALL
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
@ -189,9 +189,9 @@ RtlAtomicXor32(IN VOLATILE PLONG Address,
IN LONG Mask); IN LONG Mask);
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicXor64(IN VOLATILE PLONGLONG Address, RtlAtomicXor64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Mask); IN LONG_PTR Mask);
XTFASTCALL XTFASTCALL
USHORT USHORT

76
xtoskrnl/rtl/atomic.c
View File

@ -73,7 +73,7 @@ RtlAtomicAnd32(IN VOLATILE PLONG Address,
} }
/** /**
* Performs an atomic bitwise AND operation on the 64-bit value. * Performs an atomic bitwise AND operation on the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value on which the bitwise AND operation is to be performed. * Supplies the address of the value on which the bitwise AND operation is to be performed.
@ -86,9 +86,9 @@ RtlAtomicAnd32(IN VOLATILE PLONG Address,
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicAnd64(IN VOLATILE PLONGLONG Address, RtlAtomicAnd64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Mask) IN LONG_PTR Mask)
{ {
return __sync_fetch_and_and(Address, Mask); return __sync_fetch_and_and(Address, Mask);
} }
@ -169,7 +169,7 @@ RtlAtomicCompareExchange32(IN VOLATILE PLONG Address,
} }
/** /**
* Performs atomically compare exchange operation on the 64-bit value. * Performs atomically compare exchange operation on the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value to compare and potentially exchange. * Supplies the address of the value to compare and potentially exchange.
@ -185,10 +185,10 @@ RtlAtomicCompareExchange32(IN VOLATILE PLONG Address,
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicCompareExchange64(IN VOLATILE PLONGLONG Address, RtlAtomicCompareExchange64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Comperand, IN LONG_PTR Comperand,
IN LONGLONG Exchange) IN LONG_PTR Exchange)
{ {
return __sync_val_compare_and_swap(Address, Comperand, Exchange); return __sync_val_compare_and_swap(Address, Comperand, Exchange);
} }
@ -270,7 +270,7 @@ RtlAtomicDecrement32(IN VOLATILE PLONG Address)
} }
/** /**
* Performs atomically decrement of the 64-bit value. * Performs atomically decrement of the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value to decrement. * Supplies the address of the value to decrement.
@ -280,8 +280,8 @@ RtlAtomicDecrement32(IN VOLATILE PLONG Address)
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicDecrement64(IN VOLATILE PLONGLONG Address) RtlAtomicDecrement64(IN VOLATILE PLONG_PTR Address)
{ {
return __sync_sub_and_fetch(Address, 1); return __sync_sub_and_fetch(Address, 1);
} }
@ -350,7 +350,7 @@ RtlAtomicExchange32(IN VOLATILE PLONG Address,
} }
/** /**
* Performs atomically operation on the 64-bit value. * Performs atomically operation on the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value to exchange with. * Supplies the address of the value to exchange with.
@ -363,9 +363,9 @@ RtlAtomicExchange32(IN VOLATILE PLONG Address,
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicExchange64(IN VOLATILE PLONGLONG Address, RtlAtomicExchange64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Exchange) IN LONG_PTR Exchange)
{ {
return __sync_lock_test_and_set(Address, Exchange); return __sync_lock_test_and_set(Address, Exchange);
} }
@ -434,7 +434,7 @@ RtlAtomicExchangeAdd32(IN VOLATILE PLONG Address,
} }
/** /**
* Performs atomically addition of the 64-bit value. * Performs atomically addition of the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the original value. * Supplies the address of the original value.
@ -447,9 +447,9 @@ RtlAtomicExchangeAdd32(IN VOLATILE PLONG Address,
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicExchangeAdd64(IN VOLATILE PLONGLONG Address, RtlAtomicExchangeAdd64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Value) IN LONG_PTR Value)
{ {
return __sync_fetch_and_add(Address, Value); return __sync_fetch_and_add(Address, Value);
} }
@ -490,7 +490,7 @@ XTFASTCALL
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
RtlAtomicFlushSingleList(IN PSINGLE_LIST_HEADER Header) RtlAtomicFlushSingleList(IN PSINGLE_LIST_HEADER Header)
{ {
return (PSINGLE_LIST_ENTRY)RtlAtomicExchange64((PLONGLONG)&Header->Alignment, (LONGLONG)NULL); return (PSINGLE_LIST_ENTRY)RtlAtomicExchange64((PLONG_PTR)&Header->Alignment, (LONGLONG)NULL);
} }
/** /**
@ -545,7 +545,7 @@ RtlAtomicIncrement32(IN VOLATILE PLONG Address)
} }
/** /**
* Performs atomically increment of the 64-bit value. * Performs atomically increment of the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value to increment. * Supplies the address of the value to increment.
@ -555,8 +555,8 @@ RtlAtomicIncrement32(IN VOLATILE PLONG Address)
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicIncrement64(IN VOLATILE PLONGLONG Address) RtlAtomicIncrement64(IN VOLATILE PLONG_PTR Address)
{ {
return __sync_add_and_fetch(Address, 1); return __sync_add_and_fetch(Address, 1);
} }
@ -625,7 +625,7 @@ RtlAtomicOr32(IN VOLATILE PLONG Address,
} }
/** /**
* Performs an atomic bitwise OR operation on the 64-bit value. * Performs an atomic bitwise OR operation on the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value on which the bitwise OR operation is to be performed. * Supplies the address of the value on which the bitwise OR operation is to be performed.
@ -638,9 +638,9 @@ RtlAtomicOr32(IN VOLATILE PLONG Address,
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicOr64(IN VOLATILE PLONGLONG Address, RtlAtomicOr64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Mask) IN LONG_PTR Mask)
{ {
return __sync_fetch_and_or(Address, Mask); return __sync_fetch_and_or(Address, Mask);
} }
@ -677,9 +677,9 @@ RtlAtomicPopEntrySingleList(IN PSINGLE_LIST_HEADER Header)
NextEntry = FirstEntry; NextEntry = FirstEntry;
/* Compare and exchange */ /* Compare and exchange */
FirstEntry = (PVOID)RtlAtomicCompareExchange64((PLONGLONG)ListHead, FirstEntry = (PVOID)RtlAtomicCompareExchange64((PLONG_PTR)ListHead,
(LONGLONG)FirstEntry->Next, (LONG_PTR)FirstEntry->Next,
(LONGLONG)FirstEntry); (LONG_PTR)FirstEntry);
} while(FirstEntry != NextEntry); } while(FirstEntry != NextEntry);
/* Return removed element */ /* Return removed element */
@ -719,9 +719,9 @@ RtlAtomicPushEntrySingleList(IN PSINGLE_LIST_HEADER Header,
NextEntry = FirstEntry; NextEntry = FirstEntry;
/* Compare and exchange */ /* Compare and exchange */
FirstEntry = (PVOID)RtlAtomicCompareExchange64((PLONGLONG)ListHead, FirstEntry = (PVOID)RtlAtomicCompareExchange64((PLONG_PTR)ListHead,
(LONGLONG)ListEntry, (LONG_PTR)ListEntry,
(LONGLONG)FirstEntry); (LONG_PTR)FirstEntry);
} while(FirstEntry != NextEntry); } while(FirstEntry != NextEntry);
/* Return original first element */ /* Return original first element */
@ -792,7 +792,7 @@ RtlAtomicXor32(IN VOLATILE PLONG Address,
} }
/** /**
* Performs an atomic bitwise XOR operation on the 64-bit value. * Performs an atomic bitwise XOR operation on the 32-bit or 64-bit value depending or architecture.
* *
* @param Address * @param Address
* Supplies the address of the value on which the bitwise XOR operation is to be performed. * Supplies the address of the value on which the bitwise XOR operation is to be performed.
@ -805,9 +805,9 @@ RtlAtomicXor32(IN VOLATILE PLONG Address,
* @since XT 1.0 * @since XT 1.0
*/ */
XTFASTCALL XTFASTCALL
LONGLONG LONG_PTR
RtlAtomicXor64(IN VOLATILE PLONGLONG Address, RtlAtomicXor64(IN VOLATILE PLONG_PTR Address,
IN LONGLONG Mask) IN LONG_PTR Mask)
{ {
return __sync_fetch_and_xor(Address, Mask); return __sync_fetch_and_xor(Address, Mask);
} }