X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseLib%2FBitField.c;fp=MdePkg%2FLibrary%2FBaseLib%2FBitField.c;h=862af53e9c3f5e26115bf912b0ea394f98148dfa;hp=0f48a036ba32e7310ea109c351e1fa7dbe5b9084;hb=2f88bd3a1296c522317f1c21377876de63de5be7;hpb=1436aea4d5707e672672a11bda72be2c63c936c3 diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c index 0f48a036ba..862af53e9c 100644 --- a/MdePkg/Library/BaseLib/BitField.c +++ b/MdePkg/Library/BaseLib/BitField.c @@ -23,9 +23,9 @@ UINTN EFIAPI InternalBaseLibBitFieldReadUint ( - IN UINTN Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINTN Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { // @@ -56,10 +56,10 @@ InternalBaseLibBitFieldReadUint ( UINTN EFIAPI InternalBaseLibBitFieldOrUint ( - IN UINTN Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINTN OrData + IN UINTN Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINTN OrData ) { // @@ -74,7 +74,7 @@ InternalBaseLibBitFieldOrUint ( // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] // are 1's while bit[EndBit + 1] thru the most significant bit are 0's. // - return Operand | ((OrData << StartBit) & ~((UINTN) -2 << EndBit)); + return Operand | ((OrData << StartBit) & ~((UINTN)-2 << EndBit)); } /** @@ -98,10 +98,10 @@ InternalBaseLibBitFieldOrUint ( UINTN EFIAPI InternalBaseLibBitFieldAndUint ( - IN UINTN Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINTN AndData + IN UINTN Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINTN AndData ) { // @@ -141,9 +141,9 @@ InternalBaseLibBitFieldAndUint ( UINT8 EFIAPI BitFieldRead8 ( - IN UINT8 Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINT8 Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { ASSERT (EndBit < 8); @@ -177,10 +177,10 @@ BitFieldRead8 ( UINT8 EFIAPI BitFieldWrite8 ( - IN UINT8 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 Value + IN UINT8 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 Value ) { ASSERT (EndBit < 8); @@ -215,10 +215,10 @@ BitFieldWrite8 ( UINT8 EFIAPI BitFieldOr8 ( - IN UINT8 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 OrData + IN UINT8 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 OrData ) { ASSERT (EndBit < 8); @@ -253,10 +253,10 @@ BitFieldOr8 ( UINT8 EFIAPI BitFieldAnd8 ( - IN UINT8 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 AndData + IN UINT8 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 AndData ) { ASSERT (EndBit < 8); @@ -294,11 +294,11 @@ BitFieldAnd8 ( UINT8 EFIAPI BitFieldAndThenOr8 ( - IN UINT8 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 AndData, - IN UINT8 OrData + IN UINT8 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 AndData, + IN UINT8 OrData ) { ASSERT (EndBit < 8); @@ -333,9 +333,9 @@ BitFieldAndThenOr8 ( UINT16 EFIAPI BitFieldRead16 ( - IN UINT16 Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINT16 Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { ASSERT (EndBit < 16); @@ -369,10 +369,10 @@ BitFieldRead16 ( UINT16 EFIAPI BitFieldWrite16 ( - IN UINT16 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 Value + IN UINT16 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 Value ) { ASSERT (EndBit < 16); @@ -407,10 +407,10 @@ BitFieldWrite16 ( UINT16 EFIAPI BitFieldOr16 ( - IN UINT16 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 OrData + IN UINT16 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 OrData ) { ASSERT (EndBit < 16); @@ -445,10 +445,10 @@ BitFieldOr16 ( UINT16 EFIAPI BitFieldAnd16 ( - IN UINT16 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 AndData + IN UINT16 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 AndData ) { ASSERT (EndBit < 16); @@ -486,11 +486,11 @@ BitFieldAnd16 ( UINT16 EFIAPI BitFieldAndThenOr16 ( - IN UINT16 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 AndData, - IN UINT16 OrData + IN UINT16 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 AndData, + IN UINT16 OrData ) { ASSERT (EndBit < 16); @@ -525,9 +525,9 @@ BitFieldAndThenOr16 ( UINT32 EFIAPI BitFieldRead32 ( - IN UINT32 Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINT32 Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { ASSERT (EndBit < 32); @@ -561,10 +561,10 @@ BitFieldRead32 ( UINT32 EFIAPI BitFieldWrite32 ( - IN UINT32 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 Value + IN UINT32 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 Value ) { ASSERT (EndBit < 32); @@ -599,10 +599,10 @@ BitFieldWrite32 ( UINT32 EFIAPI BitFieldOr32 ( - IN UINT32 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 OrData + IN UINT32 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 OrData ) { ASSERT (EndBit < 32); @@ -637,10 +637,10 @@ BitFieldOr32 ( UINT32 EFIAPI BitFieldAnd32 ( - IN UINT32 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 AndData + IN UINT32 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 AndData ) { ASSERT (EndBit < 32); @@ -678,11 +678,11 @@ BitFieldAnd32 ( UINT32 EFIAPI BitFieldAndThenOr32 ( - IN UINT32 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 AndData, - IN UINT32 OrData + IN UINT32 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 AndData, + IN UINT32 OrData ) { ASSERT (EndBit < 32); @@ -717,9 +717,9 @@ BitFieldAndThenOr32 ( UINT64 EFIAPI BitFieldRead64 ( - IN UINT64 Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINT64 Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { ASSERT (EndBit < 64); @@ -753,10 +753,10 @@ BitFieldRead64 ( UINT64 EFIAPI BitFieldWrite64 ( - IN UINT64 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT64 Value + IN UINT64 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT64 Value ) { ASSERT (EndBit < 64); @@ -791,10 +791,10 @@ BitFieldWrite64 ( UINT64 EFIAPI BitFieldOr64 ( - IN UINT64 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT64 OrData + IN UINT64 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT64 OrData ) { UINT64 Value1; @@ -811,7 +811,7 @@ BitFieldOr64 ( ASSERT (RShiftU64 (OrData, EndBit - StartBit) == (RShiftU64 (OrData, EndBit - StartBit) & 1)); Value1 = LShiftU64 (OrData, StartBit); - Value2 = LShiftU64 ((UINT64) - 2, EndBit); + Value2 = LShiftU64 ((UINT64)-2, EndBit); return Operand | (Value1 & ~Value2); } @@ -843,10 +843,10 @@ BitFieldOr64 ( UINT64 EFIAPI BitFieldAnd64 ( - IN UINT64 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT64 AndData + IN UINT64 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT64 AndData ) { UINT64 Value1; @@ -898,11 +898,11 @@ BitFieldAnd64 ( UINT64 EFIAPI BitFieldAndThenOr64 ( - IN UINT64 Operand, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT64 AndData, - IN UINT64 OrData + IN UINT64 Operand, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT64 AndData, + IN UINT64 OrData ) { ASSERT (EndBit < 64); @@ -938,25 +938,25 @@ BitFieldAndThenOr64 ( UINT8 EFIAPI BitFieldCountOnes32 ( - IN UINT32 Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINT32 Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { - UINT32 Count; + UINT32 Count; ASSERT (EndBit < 32); ASSERT (StartBit <= EndBit); - Count = BitFieldRead32 (Operand, StartBit, EndBit); + Count = BitFieldRead32 (Operand, StartBit, EndBit); Count -= ((Count >> 1) & 0x55555555); - Count = (Count & 0x33333333) + ((Count >> 2) & 0x33333333); + Count = (Count & 0x33333333) + ((Count >> 2) & 0x33333333); Count += Count >> 4; Count &= 0x0F0F0F0F; Count += Count >> 8; Count += Count >> 16; - return (UINT8) Count & 0x3F; + return (UINT8)Count & 0x3F; } /** @@ -982,21 +982,20 @@ BitFieldCountOnes32 ( UINT8 EFIAPI BitFieldCountOnes64 ( - IN UINT64 Operand, - IN UINTN StartBit, - IN UINTN EndBit + IN UINT64 Operand, + IN UINTN StartBit, + IN UINTN EndBit ) { - UINT64 BitField; - UINT8 Count; + UINT64 BitField; + UINT8 Count; ASSERT (EndBit < 64); ASSERT (StartBit <= EndBit); BitField = BitFieldRead64 (Operand, StartBit, EndBit); - Count = BitFieldCountOnes32 ((UINT32) BitField, 0, 31); - Count += BitFieldCountOnes32 ((UINT32) RShiftU64(BitField, 32), 0, 31); + Count = BitFieldCountOnes32 ((UINT32)BitField, 0, 31); + Count += BitFieldCountOnes32 ((UINT32)RShiftU64 (BitField, 32), 0, 31); return Count; } -