From 058eff9c25b54a8a657a021de98ace56ad8a0c03 Mon Sep 17 00:00:00 2001 From: jljusten Date: Wed, 19 Mar 2008 20:20:17 +0000 Subject: Match case of architecture specific include path added by build system. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4923 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Foundation/Include/X64/EfiBind.h | 222 +++++++++++++++++++++ .../Foundation/Include/X64/EfiPeOptionalHeader.h | 42 ++++ .../Foundation/Include/X64/TianoBind.h | 30 +++ .../Foundation/Include/x64/EfiBind.h | 222 --------------------- .../Foundation/Include/x64/EfiPeOptionalHeader.h | 42 ---- .../Foundation/Include/x64/TianoBind.h | 30 --- 6 files changed, 294 insertions(+), 294 deletions(-) create mode 100644 EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h create mode 100644 EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h create mode 100644 EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h delete mode 100644 EdkCompatibilityPkg/Foundation/Include/x64/EfiBind.h delete mode 100644 EdkCompatibilityPkg/Foundation/Include/x64/EfiPeOptionalHeader.h delete mode 100644 EdkCompatibilityPkg/Foundation/Include/x64/TianoBind.h (limited to 'EdkCompatibilityPkg/Foundation/Include') diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h new file mode 100644 index 0000000000..2b51b66948 --- /dev/null +++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h @@ -0,0 +1,222 @@ +/*++ + +Copyright (c) 2005 - 2007, Intel Corporation +All rights reserved. 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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Module Name: + + EfiBind.h + +Abstract: + + Processor or Compiler specific defines and types for x64. + We are using the ANSI C 2000 _t type definitions for basic types. + This it technically a violation of the coding standard, but they + are used to make EfiTypes.h portable. Code other than EfiTypes.h + should never use any ANSI C 2000 _t integer types. + +--*/ + +#ifndef _EFI_BIND_H_ +#define _EFI_BIND_H_ + + +#define EFI_DRIVER_ENTRY_POINT(InitFunction) +#define EFI_APPLICATION_ENTRY_POINT EFI_DRIVER_ENTRY_POINT + + + +// +// Make sure we are useing the correct packing rules per EFI specification +// +#pragma pack() + +#if _MSC_EXTENSIONS + +// +// Disable warning that make it impossible to compile at /W4 +// This only works for Microsoft* tools +// + +// +// Disabling bitfield type checking warnings. +// +#pragma warning ( disable : 4214 ) + +// +// Disabling the unreferenced formal parameter warnings. +// +#pragma warning ( disable : 4100 ) + +// +// Disable slightly different base types warning as CHAR8 * can not be set +// to a constant string. +// +#pragma warning ( disable : 4057 ) + +// +// ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning +// +#pragma warning ( disable : 4127 ) + +// +// Int64ShllMod32 unreferenced inline function +// +#pragma warning ( disable : 4514 ) + +// +// Unreferenced formal parameter - We are object oriented, so we pass This even +// if we don't need them. +// +#pragma warning ( disable : 4100 ) + +// +// This warning is caused by empty (after preprocessing) souce file. +// +#pragma warning ( disable : 4206 ) + +// +// Warning: The result of the unary '&' operator may be unaligned. Ignore it. +// +#pragma warning ( disable : 4366 ) + +#endif + + +#if (__STDC_VERSION__ < 199901L) + // + // No ANSI C 2000 stdint.h integer width declarations, so define equivalents + // + + #if _MSC_EXTENSIONS + + // + // use Microsoft* C complier dependent interger width types + // + typedef unsigned __int64 uint64_t; + typedef __int64 int64_t; + typedef unsigned __int32 uint32_t; + typedef __int32 int32_t; + typedef unsigned short uint16_t; + typedef short int16_t; + typedef unsigned char uint8_t; + typedef char int8_t; + #else + + // + // Assume standard IA-32 alignment. + // BugBug: Need to check portability of long long + // + typedef unsigned long long uint64_t; + typedef long long int64_t; + typedef unsigned int uint32_t; + typedef int int32_t; + typedef unsigned short uint16_t; + typedef short int16_t; + typedef unsigned char uint8_t; + typedef char int8_t; + #endif +#else + // + // Use ANSI C 2000 stdint.h integer width declarations + // + #include "stdint.h" +#endif + +// +// Native integer size in stdint.h +// +typedef uint64_t uintn_t; +typedef int64_t intn_t; + +// +// Processor specific defines +// +#define EFI_MAX_BIT 0x8000000000000000 +#define MAX_2_BITS 0xC000000000000000 + +// +// Maximum legal IA-32 address +// +#define EFI_MAX_ADDRESS 0xFFFFFFFFFFFFFFFF + +// +// Bad pointer value to use in check builds. +// if you see this value you are using uninitialized or free'ed data +// +#define EFI_BAD_POINTER 0xAFAFAFAFAFAFAFAF +#define EFI_BAD_POINTER_AS_BYTE 0xAF + +// +// Inject a break point in the code to assist debugging. +// +#define EFI_DEADLOOP() { volatile int __iii; __iii = 1; while (__iii); } +#define EFI_BREAKPOINT() __debugbreak() + +// +// Memory Fence forces serialization, and is needed to support out of order +// memory transactions. The Memory Fence is mainly used to make sure IO +// transactions complete in a deterministic sequence, and to syncronize locks +// an other MP code. Currently no memory fencing is required. +// +#define MEMORY_FENCE() + +// +// Some compilers don't support the forward reference construct: +// typedef struct XXXXX. The forward reference is required for +// ANSI compatibility. +// +// The following macro provide a workaround for such cases. +// + + +#ifdef EFI_NO_INTERFACE_DECL + #define EFI_FORWARD_DECLARATION(x) +#else + #define EFI_FORWARD_DECLARATION(x) typedef struct _##x x +#endif + + +// +// Some C compilers optimize the calling conventions to increase performance. +// _EFIAPI is used to make all public APIs follow the standard C calling +// convention. +// +#if _MSC_EXTENSIONS + // + // Microsoft* compiler requires _EFIAPI useage, __cdecl is Microsoft* specific C. + // + + #define _EFIAPI __cdecl +#else + #define _EFIAPI +#endif + + +#ifdef _EFI_WINNT + + #define EFI_SUPPRESS_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ + warning ( disable : 4142 ) + + #define EFI_DEFAULT_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ + warning ( default : 4142 ) +#else + + #define EFI_SUPPRESS_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ + warning ( disable : 4068 ) + + #define EFI_DEFAULT_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ + warning ( default : 4068 ) + +#endif + + + +#endif + diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h new file mode 100644 index 0000000000..03d1dc2957 --- /dev/null +++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h @@ -0,0 +1,42 @@ +/*++ + +Copyright (c) 2005 - 2006, Intel Corporation +All rights reserved. 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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Module Name: + + EfiPeOptionalHeader.h + +Abstract: + Defines the optional header in the PE image per the PE specification. This + file must be included only from within EfiImage.h since + EFI_IMAGE_DATA_DIRECTORY and EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES are defined + there. + +--*/ + +#ifndef _EFI_PE_OPTIONAL_HEADER_H_ +#define _EFI_PE_OPTIONAL_HEADER_H_ + +#define EFI_IMAGE_MACHINE_TYPE (EFI_IMAGE_MACHINE_X64) + +#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ + (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC)) + +#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32) + +// +// Assume we can use IPF values +// +#define EFI_IMAGE_NT_OPTIONAL_HDR_MAGIC EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC +typedef EFI_IMAGE_OPTIONAL_HEADER64 EFI_IMAGE_OPTIONAL_HEADER; +typedef EFI_IMAGE_NT_HEADERS64 EFI_IMAGE_NT_HEADERS; + +#endif + diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h new file mode 100644 index 0000000000..45fe2119ac --- /dev/null +++ b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h @@ -0,0 +1,30 @@ +/*++ + +Copyright (c) 2005, Intel Corporation +All rights reserved. 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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Module Name: + + TianoBind.h + +Abstract: + + Tiano's Processor or Compiler specific defines and types for Intel?Itanium(TM) + besides EfiBind.h. + +--*/ + +#ifndef _TIANO_BIND_H_ +#define _TIANO_BIND_H_ + +#include "EfiBind.h" + +#define EFI_DXE_ENTRY_POINT(InitFunction) + +#endif diff --git a/EdkCompatibilityPkg/Foundation/Include/x64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/x64/EfiBind.h deleted file mode 100644 index 2b51b66948..0000000000 --- a/EdkCompatibilityPkg/Foundation/Include/x64/EfiBind.h +++ /dev/null @@ -1,222 +0,0 @@ -/*++ - -Copyright (c) 2005 - 2007, Intel Corporation -All rights reserved. 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - EfiBind.h - -Abstract: - - Processor or Compiler specific defines and types for x64. - We are using the ANSI C 2000 _t type definitions for basic types. - This it technically a violation of the coding standard, but they - are used to make EfiTypes.h portable. Code other than EfiTypes.h - should never use any ANSI C 2000 _t integer types. - ---*/ - -#ifndef _EFI_BIND_H_ -#define _EFI_BIND_H_ - - -#define EFI_DRIVER_ENTRY_POINT(InitFunction) -#define EFI_APPLICATION_ENTRY_POINT EFI_DRIVER_ENTRY_POINT - - - -// -// Make sure we are useing the correct packing rules per EFI specification -// -#pragma pack() - -#if _MSC_EXTENSIONS - -// -// Disable warning that make it impossible to compile at /W4 -// This only works for Microsoft* tools -// - -// -// Disabling bitfield type checking warnings. -// -#pragma warning ( disable : 4214 ) - -// -// Disabling the unreferenced formal parameter warnings. -// -#pragma warning ( disable : 4100 ) - -// -// Disable slightly different base types warning as CHAR8 * can not be set -// to a constant string. -// -#pragma warning ( disable : 4057 ) - -// -// ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning -// -#pragma warning ( disable : 4127 ) - -// -// Int64ShllMod32 unreferenced inline function -// -#pragma warning ( disable : 4514 ) - -// -// Unreferenced formal parameter - We are object oriented, so we pass This even -// if we don't need them. -// -#pragma warning ( disable : 4100 ) - -// -// This warning is caused by empty (after preprocessing) souce file. -// -#pragma warning ( disable : 4206 ) - -// -// Warning: The result of the unary '&' operator may be unaligned. Ignore it. -// -#pragma warning ( disable : 4366 ) - -#endif - - -#if (__STDC_VERSION__ < 199901L) - // - // No ANSI C 2000 stdint.h integer width declarations, so define equivalents - // - - #if _MSC_EXTENSIONS - - // - // use Microsoft* C complier dependent interger width types - // - typedef unsigned __int64 uint64_t; - typedef __int64 int64_t; - typedef unsigned __int32 uint32_t; - typedef __int32 int32_t; - typedef unsigned short uint16_t; - typedef short int16_t; - typedef unsigned char uint8_t; - typedef char int8_t; - #else - - // - // Assume standard IA-32 alignment. - // BugBug: Need to check portability of long long - // - typedef unsigned long long uint64_t; - typedef long long int64_t; - typedef unsigned int uint32_t; - typedef int int32_t; - typedef unsigned short uint16_t; - typedef short int16_t; - typedef unsigned char uint8_t; - typedef char int8_t; - #endif -#else - // - // Use ANSI C 2000 stdint.h integer width declarations - // - #include "stdint.h" -#endif - -// -// Native integer size in stdint.h -// -typedef uint64_t uintn_t; -typedef int64_t intn_t; - -// -// Processor specific defines -// -#define EFI_MAX_BIT 0x8000000000000000 -#define MAX_2_BITS 0xC000000000000000 - -// -// Maximum legal IA-32 address -// -#define EFI_MAX_ADDRESS 0xFFFFFFFFFFFFFFFF - -// -// Bad pointer value to use in check builds. -// if you see this value you are using uninitialized or free'ed data -// -#define EFI_BAD_POINTER 0xAFAFAFAFAFAFAFAF -#define EFI_BAD_POINTER_AS_BYTE 0xAF - -// -// Inject a break point in the code to assist debugging. -// -#define EFI_DEADLOOP() { volatile int __iii; __iii = 1; while (__iii); } -#define EFI_BREAKPOINT() __debugbreak() - -// -// Memory Fence forces serialization, and is needed to support out of order -// memory transactions. The Memory Fence is mainly used to make sure IO -// transactions complete in a deterministic sequence, and to syncronize locks -// an other MP code. Currently no memory fencing is required. -// -#define MEMORY_FENCE() - -// -// Some compilers don't support the forward reference construct: -// typedef struct XXXXX. The forward reference is required for -// ANSI compatibility. -// -// The following macro provide a workaround for such cases. -// - - -#ifdef EFI_NO_INTERFACE_DECL - #define EFI_FORWARD_DECLARATION(x) -#else - #define EFI_FORWARD_DECLARATION(x) typedef struct _##x x -#endif - - -// -// Some C compilers optimize the calling conventions to increase performance. -// _EFIAPI is used to make all public APIs follow the standard C calling -// convention. -// -#if _MSC_EXTENSIONS - // - // Microsoft* compiler requires _EFIAPI useage, __cdecl is Microsoft* specific C. - // - - #define _EFIAPI __cdecl -#else - #define _EFIAPI -#endif - - -#ifdef _EFI_WINNT - - #define EFI_SUPPRESS_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ - warning ( disable : 4142 ) - - #define EFI_DEFAULT_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ - warning ( default : 4142 ) -#else - - #define EFI_SUPPRESS_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ - warning ( disable : 4068 ) - - #define EFI_DEFAULT_BENIGN_REDEFINITION_OF_TYPE_WARNING() \ - warning ( default : 4068 ) - -#endif - - - -#endif - diff --git a/EdkCompatibilityPkg/Foundation/Include/x64/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/x64/EfiPeOptionalHeader.h deleted file mode 100644 index 03d1dc2957..0000000000 --- a/EdkCompatibilityPkg/Foundation/Include/x64/EfiPeOptionalHeader.h +++ /dev/null @@ -1,42 +0,0 @@ -/*++ - -Copyright (c) 2005 - 2006, Intel Corporation -All rights reserved. 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - EfiPeOptionalHeader.h - -Abstract: - Defines the optional header in the PE image per the PE specification. This - file must be included only from within EfiImage.h since - EFI_IMAGE_DATA_DIRECTORY and EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES are defined - there. - ---*/ - -#ifndef _EFI_PE_OPTIONAL_HEADER_H_ -#define _EFI_PE_OPTIONAL_HEADER_H_ - -#define EFI_IMAGE_MACHINE_TYPE (EFI_IMAGE_MACHINE_X64) - -#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ - (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC)) - -#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32) - -// -// Assume we can use IPF values -// -#define EFI_IMAGE_NT_OPTIONAL_HDR_MAGIC EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC -typedef EFI_IMAGE_OPTIONAL_HEADER64 EFI_IMAGE_OPTIONAL_HEADER; -typedef EFI_IMAGE_NT_HEADERS64 EFI_IMAGE_NT_HEADERS; - -#endif - diff --git a/EdkCompatibilityPkg/Foundation/Include/x64/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/x64/TianoBind.h deleted file mode 100644 index 45fe2119ac..0000000000 --- a/EdkCompatibilityPkg/Foundation/Include/x64/TianoBind.h +++ /dev/null @@ -1,30 +0,0 @@ -/*++ - -Copyright (c) 2005, Intel Corporation -All rights reserved. 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - TianoBind.h - -Abstract: - - Tiano's Processor or Compiler specific defines and types for Intel?Itanium(TM) - besides EfiBind.h. - ---*/ - -#ifndef _TIANO_BIND_H_ -#define _TIANO_BIND_H_ - -#include "EfiBind.h" - -#define EFI_DXE_ENTRY_POINT(InitFunction) - -#endif -- cgit v1.2.3