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>

1 files changed, 40 insertions, 39 deletions

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

 

 //

-// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with

-// Section 2.3.1 of the UEFI 2.3 Specification.

-//

-VERIFY_SIZE_OF (BOOLEAN, 1);

-VERIFY_SIZE_OF (INT8, 1);

-VERIFY_SIZE_OF (UINT8, 1);

-VERIFY_SIZE_OF (INT16, 2);

-VERIFY_SIZE_OF (UINT16, 2);

-VERIFY_SIZE_OF (INT32, 4);

-VERIFY_SIZE_OF (UINT32, 4);

-VERIFY_SIZE_OF (INT64, 8);

-VERIFY_SIZE_OF (UINT64, 8);

-VERIFY_SIZE_OF (CHAR8, 1);

-VERIFY_SIZE_OF (CHAR16, 2);

-

-//

-// The following three enum types are used to verify that the compiler

-// configuration for enum types is compliant with Section 2.3.1 of the

-// UEFI 2.3 Specification. These enum types and enum values are not

-// intended to be used. A prefix of '__' is used avoid conflicts with

-// other types.

-//

-typedef enum {

-  __VerifyUint8EnumValue = 0xff

-} __VERIFY_UINT8_ENUM_SIZE;

-

-typedef enum {

-  __VerifyUint16EnumValue = 0xffff

-} __VERIFY_UINT16_ENUM_SIZE;

-

-typedef enum {

-  __VerifyUint32EnumValue = 0xffffffff

-} __VERIFY_UINT32_ENUM_SIZE;

-

-VERIFY_SIZE_OF (__VERIFY_UINT8_ENUM_SIZE, 4);

-VERIFY_SIZE_OF (__VERIFY_UINT16_ENUM_SIZE, 4);

-VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4);

-

-//

 // The Microsoft* C compiler can removed references to unreferenced data items

 //  if the /OPT:REF linker option is used. We defined a macro as this is a

 //  a non standard extension

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

 #endif

 

+//

+// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with

+// Section 2.3.1 of the UEFI 2.3 Specification.

+//

+

+STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (INT8)    == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (UINT8)   == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (INT16)   == 2, "sizeof (INT16) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (UINT16)  == 2, "sizeof (UINT16) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (INT32)   == 4, "sizeof (INT32) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (UINT32)  == 4, "sizeof (UINT32) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (INT64)   == 8, "sizeof (INT64) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (UINT64)  == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (CHAR16)  == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");

+

+//

+// The following three enum types are used to verify that the compiler

+// configuration for enum types is compliant with Section 2.3.1 of the

+// UEFI 2.3 Specification. These enum types and enum values are not

+// intended to be used. A prefix of '__' is used avoid conflicts with

+// other types.

+//

+typedef enum {

+  __VerifyUint8EnumValue = 0xff

+} __VERIFY_UINT8_ENUM_SIZE;

+

+typedef enum {

+  __VerifyUint16EnumValue = 0xffff

+} __VERIFY_UINT16_ENUM_SIZE;

+

+typedef enum {

+  __VerifyUint32EnumValue = 0xffffffff

+} __VERIFY_UINT32_ENUM_SIZE;

+

+STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");

+STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");

+

 /**

   Macro that returns a pointer to the data structure that contains a specified field of

   that data structure.  This is a lightweight method to hide information by placing a