Add a new EFI_NOINLINE macro and clean up eficompiler.h

Guard the macros by the compilers they should explicitly apply to and
add a #error in case the compiler has no alignment directive defined,
as ignoring alignment is likely to produce runtime errors.
Also prefer _MSC_VER to _MSC_EXTENSIONS, as _MSC_EXTENSIONS may not
always be defined by the MSVC compiler.

Signed-off-by: Pete Batard <pete@akeo.ie>
This commit is contained in:
Pete Batard 2024-05-14 12:52:26 +01:00
parent 9bd6d4ad54
commit f2f17bfb16
No known key found for this signature in database
GPG Key ID: 38E0CF5E69EDD671
1 changed files with 31 additions and 22 deletions

View File

@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2016 Pete Batard <pete@akeo.ie> Copyright (c) 2016-2024 Pete Batard <pete@akeo.ie>
Module Name: Module Name:
@ -12,49 +12,58 @@ Abstract:
--*/ --*/
#ifdef _MSC_EXTENSIONS #if defined(__GNUC__)
#define EFI_UNUSED
#else
#define EFI_UNUSED __attribute__((__unused__)) #define EFI_UNUSED __attribute__((__unused__))
#else
#define EFI_UNUSED
#endif #endif
#ifdef _MSC_EXTENSIONS #if defined(__clang__)
#define EFI_NO_TAIL_CALL
#else
#ifdef __clang__
#define EFI_NO_TAIL_CALL __attribute__((disable_tail_calls)) #define EFI_NO_TAIL_CALL __attribute__((disable_tail_calls))
#else #elif defined(__GNUC__)
#define EFI_NO_TAIL_CALL __attribute__((optimize("no-optimize-sibling-calls"))) #define EFI_NO_TAIL_CALL __attribute__((optimize("no-optimize-sibling-calls")))
#endif #else
#define EFI_NO_TAIL_CALL
#endif #endif
#ifdef _MSC_EXTENSIONS #if defined(__clang__)
#define EFI_OPTNONE
#else
#ifdef __clang__
#define EFI_OPTNONE __attribute__((optnone)) #define EFI_OPTNONE __attribute__((optnone))
#else #elif defined(__GNUC__)
#define EFI_OPTNONE __attribute__((__optimize__("0"))) #define EFI_OPTNONE __attribute__((__optimize__("0")))
#endif #else
#define EFI_OPTNONE
#endif #endif
#ifdef _MSC_EXTENSIONS #if defined(__GNUC__)
#define EFI_ALIGN(x) __attribute__((__aligned__(x)))
#elif defined(_MSC_VER)
#define EFI_ALIGN(x) __declspec(align(x)) #define EFI_ALIGN(x) __declspec(align(x))
#else #else
#define EFI_ALIGN(x) __attribute__((__aligned__(x))) // Not being able to align is likely to break executables, so report it
#error "No alignement directive is defined for this platform"
#endif #endif
#ifndef ALIGN #if !defined(ALIGN)
#define ALIGN(x) EFI_ALIGN(x) #define ALIGN(x) EFI_ALIGN(x)
#endif #endif
#ifdef _MSC_EXTENSIONS #if defined(__GNUC__)
#define EFI_NORETURN __attribute__((noreturn))
#elif defined(_MSC_VER)
#define EFI_NORETURN __declspec(noreturn) #define EFI_NORETURN __declspec(noreturn)
#else #else
#define EFI_NORETURN __attribute__((noreturn)) #define EFI_NORETURN
#endif
#if defined(__GNUC__)
#define EFI_NOINLINE __attribute__((noinline))
#elif defined(_MSC_VER)
#define EFI_NOINLINE __declspec(noinline)
#else
#define EFI_NOINLINE
#endif #endif
/* Also add a catch-all on __attribute__() for MS compilers */ /* Also add a catch-all on __attribute__() for MS compilers */
#ifdef _MSC_EXTENSIONS #if defined(_MSC_VER)
#define __attribute__(x) #define __attribute__(x)
#endif #endif