Add ASSERT() for BitField operations to make sure the input value is valid.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Kinney, Michael D <Michael.D.Kinney@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14019 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 41 insertions, 1 deletions

diff --git a/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
index 29d4af58d6..c872ebf554 100644
--- a/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
+++ b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the

   Base Library.

 

-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2012, 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

@@ -148,6 +148,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -188,6 +189,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -228,6 +230,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -270,6 +273,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -428,6 +433,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -468,6 +474,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -508,6 +515,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -550,6 +558,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -708,6 +718,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -748,6 +759,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -788,6 +800,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -830,6 +843,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -988,6 +1003,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1028,6 +1044,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1068,6 +1085,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1110,6 +1128,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1268,6 +1288,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1309,6 +1330,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1350,6 +1372,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1392,6 +1415,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1550,6 +1575,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1591,6 +1617,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1632,6 +1659,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1674,6 +1702,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1832,6 +1862,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1873,6 +1904,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1914,6 +1946,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1956,6 +1989,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2114,6 +2149,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2155,6 +2191,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2196,6 +2233,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2238,6 +2276,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.