tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating processor bindings to not use stdint.h. Also added code to verify at compile time that data widths are correct. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10232 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
geekboy15a 2010-03-11 20:52:54 +00:00
parent 4903c013bc
commit 52aa9e136b
4 changed files with 278 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MdePkg/Include/Base.h
View File

@ -27,6 +27,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
// //
#include <ProcessorBind.h> #include <ProcessorBind.h>
//
// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with
// Section 2.3.1 of the UEFI 2.3 Specification. Generates a divide by zero
// error or a zero size array declaration in the preprocessor if the size is
// incorrect. These are declared as "extern" so the space for these arrays will
// not be in the modules.
//
extern UINT8 _VerifySizeOfBoolean [(sizeof(BOOLEAN) == 1) / (sizeof(BOOLEAN) == 1)];
extern UINT8 _VerifySizeOfInt8 [(sizeof(INT8) == 1) / (sizeof(INT8) == 1)];
extern UINT8 _VerifySizeOfUint8 [(sizeof(UINT8) == 1) / (sizeof(UINT8) == 1)];
extern UINT8 _VerifySizeOfInt16 [(sizeof(INT16) == 2) / (sizeof(INT16) == 2)];
extern UINT8 _VerifySizeOfUint16 [(sizeof(UINT16) == 2) / (sizeof(UINT16) == 2)];
extern UINT8 _VerifySizeOfInt32 [(sizeof(INT32) == 4) / (sizeof(INT32) == 4)];
extern UINT8 _VerifySizeOfUint32 [(sizeof(UINT32) == 4) / (sizeof(UINT32) == 4)];
extern UINT8 _VerifySizeOfInt64 [(sizeof(INT64) == 8) / (sizeof(INT64) == 8)];
extern UINT8 _VerifySizeOfUint64 [(sizeof(UINT64) == 8) / (sizeof(UINT64) == 8)];
extern UINT8 _VerifySizeOfChar8 [(sizeof(CHAR8) == 1) / (sizeof(CHAR8) == 1)];
extern UINT8 _VerifySizeOfChar16 [(sizeof(CHAR16) == 2) / (sizeof(CHAR16) == 2)];
// //
// The Microsoft* C compiler can removed references to unreferenced data items // 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 // if the /OPT:REF linker option is used. We defined a macro as this is a

69
MdePkg/Include/Ia32/ProcessorBind.h
View File

@ -96,12 +96,7 @@
#endif #endif
#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L) #if defined(_MSC_EXTENSIONS)
//
// No ANSI C 2000 stdint.h integer width declarations, so define equivalents
//
#if defined(_MSC_EXTENSIONS)
// //
// use Microsoft C complier dependent integer width types // use Microsoft C complier dependent integer width types
@ -153,13 +148,7 @@
/// 1-byte signed value /// 1-byte signed value
/// ///
typedef char INT8; typedef char INT8;
#else #else
//
// Assume standard IA-32 alignment.
// Need to check portability of long long
//
/// ///
/// 8-byte unsigned value /// 8-byte unsigned value
/// ///
@ -206,60 +195,6 @@
/// 1-byte signed value /// 1-byte signed value
/// ///
typedef char INT8; typedef char INT8;
#endif
#else
//
// Use ANSI C 2000 stdint.h integer width declarations
//
#include <stdint.h>
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef uint8_t BOOLEAN;
///
/// 1-byte signed value
///
typedef int8_t INT8;
///
/// 1-byte unsigned value
///
typedef uint8_t UINT8;
///
/// 2-byte signed value
///
typedef int16_t INT16;
///
/// 2-byte unsigned value
///
typedef uint16_t UINT16;
///
/// 4-byte signed value
///
typedef int32_t INT32;
///
/// 4-byte unsigned value
///
typedef uint32_t UINT32;
///
/// 8-byte signed value
///
typedef int64_t INT64;
///
/// 8-byte unsigned value
///
typedef uint64_t UINT64;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef uint16_t CHAR16;
#endif #endif
/// ///

121
MdePkg/Include/Ipf/ProcessorBind.h
View File

@ -106,13 +106,7 @@
#endif #endif
#if defined(_MSC_EXTENSIONS)
#if !defined (__STDC_VERSION__) || (__STDC_VERSION__) < 199901L
//
// No ANSI C 2000 stdint.h integer width declarations, so define equivalents
//
#if defined(_MSC_EXTENSIONS)
// //
// use Microsoft C compiler dependent integer width types // use Microsoft C compiler dependent integer width types
// //
@ -163,12 +157,7 @@
/// 1-byte signed value /// 1-byte signed value
/// ///
typedef char INT8; typedef char INT8;
#else #else
#if defined(_EFI_P64)
//
// P64 - pointers being 64-bit and longs and ints are 32-bits.
//
/// ///
/// 8-byte unsigned value /// 8-byte unsigned value
/// ///
@ -186,57 +175,6 @@
/// ///
typedef int INT32; typedef int INT32;
/// ///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef unsigned short CHAR16;
///
/// 2-byte unsigned value
///
typedef unsigned short UINT16;
///
/// 2-byte signed value
///
typedef short INT16;
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef unsigned char BOOLEAN;
///
/// 1-byte unsigned value
///
typedef unsigned char UINT8;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 1-byte signed value
///
typedef char INT8;
#else
//
// Assume LP64 - longs and pointers are 64-bit. Ints are 32-bit.
//
///
/// 8-byte unsigned value
///
typedef unsigned long UINT64;
///
/// 8-byte signed value
///
typedef long INT64;
///
/// 4-byte unsigned value
///
typedef unsigned int UINT32;
///
/// 4-byte signed value
///
typedef int INT32;
///
/// 2-byte unsigned value /// 2-byte unsigned value
/// ///
typedef unsigned short UINT16; typedef unsigned short UINT16;
@ -266,61 +204,6 @@
/// 1-byte signed value /// 1-byte signed value
/// ///
typedef char INT8; typedef char INT8;
#endif
#endif
#else
//
// Use ANSI C 2000 stdint.h integer width declarations
//
#include <stdint.h>
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef uint8_t BOOLEAN;
///
/// 1-byte signed value
///
typedef int8_t INT8;
///
/// 1-byte unsigned value
///
typedef uint8_t UINT8;
///
/// 2-byte signed value
///
typedef int16_t INT16;
///
/// 2-byte unsigned value
///
typedef uint16_t UINT16;
///
/// 4-byte signed value
///
typedef int32_t INT32;
///
/// 4-byte unsigned value
///
typedef uint32_t UINT32;
///
/// 8-byte signed value
///
typedef int64_t INT64;
///
/// 8-byte unsigned value
///
typedef uint64_t UINT64;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef uint16_t CHAR16;
#endif #endif
/// ///

120
MdePkg/Include/X64/ProcessorBind.h
View File

@ -97,12 +97,7 @@
#endif #endif
#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L) #if defined(_MSC_EXTENSIONS)
//
// No ANSI C 2000 stdint.h integer width declarations, so define equivalents
//
#if defined(_MSC_EXTENSIONS)
// //
// use Microsoft C complier dependent integer width types // use Microsoft C complier dependent integer width types
// //
@ -153,12 +148,7 @@
/// 1-byte signed value /// 1-byte signed value
/// ///
typedef char INT8; typedef char INT8;
#else #else
#if defined(_EFI_P64)
//
// P64 - pointers being 64-bit and longs and ints are 32-bits.
//
/// ///
/// 8-byte unsigned value /// 8-byte unsigned value
/// ///
@ -176,57 +166,6 @@
/// ///
typedef int INT32; typedef int INT32;
/// ///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef unsigned short CHAR16;
///
/// 2-byte unsigned value
///
typedef unsigned short UINT16;
///
/// 2-byte signed value
///
typedef short INT16;
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef unsigned char BOOLEAN;
///
/// 1-byte unsigned value
///
typedef unsigned char UINT8;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 1-byte signed value
///
typedef char INT8;
#else
//
// Assume LP64 - longs and pointers are 64-bit. Ints are 32-bit.
//
///
/// 8-byte unsigned value
///
typedef unsigned long UINT64;
///
/// 8-byte signed value
///
typedef long INT64;
///
/// 4-byte unsigned value
///
typedef unsigned int UINT32;
///
/// 4-byte signed value
///
typedef int INT32;
///
/// 2-byte unsigned value /// 2-byte unsigned value
/// ///
typedef unsigned short UINT16; typedef unsigned short UINT16;
@ -256,61 +195,6 @@
/// 1-byte signed value /// 1-byte signed value
/// ///
typedef char INT8; typedef char INT8;
#endif
#endif
#else
//
// Use ANSI C 2000 stdint.h integer width declarations
//
#include <stdint.h>
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef uint8_t BOOLEAN;
///
/// 1-byte signed value
///
typedef int8_t INT8;
///
/// 1-byte unsigned value
///
typedef uint8_t UINT8;
///
/// 2-byte signed value
///
typedef int16_t INT16;
///
/// 2-byte unsigned value
///
typedef uint16_t UINT16;
///
/// 4-byte signed value
///
typedef int32_t INT32;
///
/// 4-byte unsigned value
///
typedef uint32_t UINT32;
///
/// 8-byte signed value
///
typedef int64_t INT64;
///
/// 8-byte unsigned value
///
typedef uint64_t UINT64;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef uint16_t CHAR16;
#endif #endif
/// ///