MdePkg: Use STATIC_ASSERT macro

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2048

Use new STATIC_ASSERT macro instead of VERIFY_SIZE_OF.

Signed-off-by: Vitaly Cheptsov <vit9696@protonmail.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index ec096133baafd40a17afc97bddc674af88e63b55..d871422cd690b6d671346ccb7ef9536f9c4d95df 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -41,45 +41,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 #define VERIFY_SIZE_OF(TYPE, Size) extern UINT8 _VerifySizeof##TYPE[(sizeof(TYPE) == (Size)) / (sizeof(TYPE) == (Size))]\r
 \r
 **/\r
 #define VERIFY_SIZE_OF(TYPE, Size) extern UINT8 _VerifySizeof##TYPE[(sizeof(TYPE) == (Size)) / (sizeof(TYPE) == (Size))]\r
 \r

-//\r
-// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with\r
-// Section 2.3.1 of the UEFI 2.3 Specification.\r
-//\r
-VERIFY_SIZE_OF (BOOLEAN, 1);\r
-VERIFY_SIZE_OF (INT8, 1);\r
-VERIFY_SIZE_OF (UINT8, 1);\r
-VERIFY_SIZE_OF (INT16, 2);\r
-VERIFY_SIZE_OF (UINT16, 2);\r
-VERIFY_SIZE_OF (INT32, 4);\r
-VERIFY_SIZE_OF (UINT32, 4);\r
-VERIFY_SIZE_OF (INT64, 8);\r
-VERIFY_SIZE_OF (UINT64, 8);\r
-VERIFY_SIZE_OF (CHAR8, 1);\r
-VERIFY_SIZE_OF (CHAR16, 2);\r
-\r
-//\r
-// The following three enum types are used to verify that the compiler\r
-// configuration for enum types is compliant with Section 2.3.1 of the\r
-// UEFI 2.3 Specification. These enum types and enum values are not\r
-// intended to be used. A prefix of '__' is used avoid conflicts with\r
-// other types.\r
-//\r
-typedef enum {\r
-  __VerifyUint8EnumValue = 0xff\r
-} __VERIFY_UINT8_ENUM_SIZE;\r
-\r
-typedef enum {\r
-  __VerifyUint16EnumValue = 0xffff\r
-} __VERIFY_UINT16_ENUM_SIZE;\r
-\r
-typedef enum {\r
-  __VerifyUint32EnumValue = 0xffffffff\r
-} __VERIFY_UINT32_ENUM_SIZE;\r
-\r
-VERIFY_SIZE_OF (__VERIFY_UINT8_ENUM_SIZE, 4);\r
-VERIFY_SIZE_OF (__VERIFY_UINT16_ENUM_SIZE, 4);\r
-VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4);\r
-\r

 //\r
 // The Microsoft* C compiler can removed references to unreferenced data items\r
 //  if the /OPT:REF linker option is used. We defined a macro as this is a\r
 //\r
 // The Microsoft* C compiler can removed references to unreferenced data items\r
 //  if the /OPT:REF linker option is used. We defined a macro as this is a\r


@@ -857,6 +818,46 @@ typedef UINTN  *BASE_LIST;
   #define STATIC_ASSERT _Static_assert\r
 #endif\r
 \r
   #define STATIC_ASSERT _Static_assert\r
 #endif\r
 \r

+//\r
+// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with\r
+// Section 2.3.1 of the UEFI 2.3 Specification.\r
+//\r
+\r
+STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (INT8)    == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (UINT8)   == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (INT16)   == 2, "sizeof (INT16) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (UINT16)  == 2, "sizeof (UINT16) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (INT32)   == 4, "sizeof (INT32) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (UINT32)  == 4, "sizeof (UINT32) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (INT64)   == 8, "sizeof (INT64) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (UINT64)  == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (CHAR16)  == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");\r
+\r
+//\r
+// The following three enum types are used to verify that the compiler\r
+// configuration for enum types is compliant with Section 2.3.1 of the\r
+// UEFI 2.3 Specification. These enum types and enum values are not\r
+// intended to be used. A prefix of '__' is used avoid conflicts with\r
+// other types.\r
+//\r
+typedef enum {\r
+  __VerifyUint8EnumValue = 0xff\r
+} __VERIFY_UINT8_ENUM_SIZE;\r
+\r
+typedef enum {\r
+  __VerifyUint16EnumValue = 0xffff\r
+} __VERIFY_UINT16_ENUM_SIZE;\r
+\r
+typedef enum {\r
+  __VerifyUint32EnumValue = 0xffffffff\r
+} __VERIFY_UINT32_ENUM_SIZE;\r
+\r
+STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");\r
+STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");\r
+\r

 /**\r
   Macro that returns a pointer to the data structure that contains a specified field of\r
   that data structure.  This is a lightweight method to hide information by placing a\r
 /**\r
   Macro that returns a pointer to the data structure that contains a specified field of\r
   that data structure.  This is a lightweight method to hide information by placing a\r