Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added special handling for shift value 32.

Browse source 
svn path=/trunk/; revision=4045
This commit is contained in:
Hartmut Birr 2003-01-19 01:49:10 +00:00
parent 25f4f4f91c
commit ac0965daf7
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/ntoskrnl/rtl/bitmap.c
View file

@ -1,4 +1,4 @@
/* $Id: bitmap.c,v 1.6 2002/11/11 22:53:26 hbirr Exp $ /* $Id: bitmap.c,v 1.7 2003/01/19 01:49:10 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -13,6 +13,8 @@
#define ALIGN(x,align) (((x)+(align)-1) / (align)) #define ALIGN(x,align) (((x)+(align)-1) / (align))
#define MASK(Count, Shift) ((Count) == 32 ? 0xFFFFFFFF : ~(0xFFFFFFFF << (Count)) << (Shift))
VOID VOID
STDCALL STDCALL
@ -55,7 +57,7 @@ RtlAreBitsClear (
Count = (Length > 32 - Shift) ? 32 - Shift : Length; Count = (Length > 32 - Shift) ? 32 - Shift : Length;
/* check dword */ /* check dword */
if (*Ptr++ & (~(0xFFFFFFFF << Count) << Shift)) if (*Ptr++ & MASK(Count, Shift))
return FALSE; return FALSE;
Length -= Count; Length -= Count;
@ -94,7 +96,7 @@ RtlAreBitsSet (
Count = (Length > 32 - Shift) ? 32 - Shift : Length; Count = (Length > 32 - Shift) ? 32 - Shift : Length;
/* check dword */ /* check dword */
if (~*Ptr++ & (~(0xFFFFFFFF << Count) << Shift)) if (~*Ptr++ & MASK(Count, Shift))
return FALSE; return FALSE;
Length -= Count; Length -= Count;
@ -113,7 +115,7 @@ RtlClearAllBits (
{ {
memset (BitMapHeader->Buffer, memset (BitMapHeader->Buffer,
0x00, 0x00,
ALIGN(BitMapHeader->SizeOfBitMap, 32)); ALIGN(BitMapHeader->SizeOfBitMap, 8));
} }
@ -146,7 +148,7 @@ RtlClearBits (
Count = (NumberToClear > 32 - Shift ) ? 32 - Shift : NumberToClear; Count = (NumberToClear > 32 - Shift ) ? 32 - Shift : NumberToClear;
/* adjust dword */ /* adjust dword */
*Ptr++ &= ~(~(0xFFFFFFFF << Count) << Shift); *Ptr++ &= ~MASK(Count, Shift);
NumberToClear -= Count; NumberToClear -= Count;
StartingIndex += Count; StartingIndex += Count;
} }
@ -607,7 +609,7 @@ RtlSetAllBits (
{ {
memset (BitMapHeader->Buffer, memset (BitMapHeader->Buffer,
0xFF, 0xFF,
ALIGN(BitMapHeader->SizeOfBitMap, 32)); ALIGN(BitMapHeader->SizeOfBitMap, 8));
} }
@ -640,7 +642,7 @@ RtlSetBits (
Count = (NumberToSet > 32 - Shift) ? 32 - Shift : NumberToSet; Count = (NumberToSet > 32 - Shift) ? 32 - Shift : NumberToSet;
/* adjust dword */ /* adjust dword */
*Ptr++ |= ~(0xFFFFFFFF << Count) << Shift; *Ptr++ |= MASK(Count, Shift);
NumberToSet -= Count; NumberToSet -= Count;
StartingIndex += Count; StartingIndex += Count;
} }