diff options
| -rw-r--r-- | payloads/libpayload/drivers/video/graphics.c | 1 | ||||
| -rw-r--r-- | payloads/libpayload/include/libpayload.h | 26 | ||||
| -rw-r--r-- | payloads/libpayload/include/stddef.h | 17 | ||||
| -rw-r--r-- | payloads/libpayload/include/stdlib.h | 6 | ||||
| -rw-r--r-- | src/commonlib/bsd/include/commonlib/bsd/helpers.h | 6 | ||||
| -rw-r--r-- | src/include/string.h | 6 |
6 files changed, 8 insertions, 54 deletions
diff --git a/payloads/libpayload/drivers/video/graphics.c b/payloads/libpayload/drivers/video/graphics.c index 7f08d40ea2..632a283de9 100644 --- a/payloads/libpayload/drivers/video/graphics.c +++ b/payloads/libpayload/drivers/video/graphics.c @@ -57,7 +57,6 @@ static const struct cb_framebuffer *fbinfo; #define PIVOT_H_MASK (PIVOT_H_LEFT|PIVOT_H_CENTER|PIVOT_H_RIGHT) #define PIVOT_V_MASK (PIVOT_V_TOP|PIVOT_V_CENTER|PIVOT_V_BOTTOM) #define ROUNDUP(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) -#define ABS(x) ((x) < 0 ? -(x) : (x)) static char initialized = 0; diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 90aeeeba0a..24c48c1854 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -46,6 +46,7 @@ #include <libpayload-config.h> #include <cbgfx.h> #include <commonlib/bsd/fmap_serialized.h> +#include <commonlib/bsd/helpers.h> #include <commonlib/bsd/mem_chip_info.h> #include <ctype.h> #include <die.h> @@ -67,33 +68,8 @@ #include <pci.h> #include <archive.h> -/* Double-evaluation unsafe min/max, for bitfields and outside of functions */ -#define __CMP_UNSAFE(a, b, op) ((a) op (b) ? (a) : (b)) -#define MIN_UNSAFE(a, b) __CMP_UNSAFE(a, b, <) -#define MAX_UNSAFE(a, b) __CMP_UNSAFE(a, b, >) - -#define __CMP_SAFE(a, b, op, var_a, var_b) ({ \ - __TYPEOF_UNLESS_CONST(a, b) var_a = (a); \ - __TYPEOF_UNLESS_CONST(b, a) var_b = (b); \ - var_a op var_b ? var_a : var_b; \ -}) - -#define __CMP(a, b, op) __builtin_choose_expr( \ - __builtin_constant_p(a) && __builtin_constant_p(b), \ - __CMP_UNSAFE(a, b, op), __CMP_SAFE(a, b, op, __TMPNAME, __TMPNAME)) - -#define MIN(a, b) __CMP(a, b, <) -#define MAX(a, b) __CMP(a, b, >) - -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define BIT(x) (1ul << (x)) -#define DIV_ROUND_UP(x, y) ({ \ - typeof(x) _div_local_x = (x); \ - typeof(y) _div_local_y = (y); \ - (_div_local_x + _div_local_y - 1) / _div_local_y; \ -}) - static inline u32 div_round_up(u32 n, u32 d) { return (n + d - 1) / d; } #define LITTLE_ENDIAN 1234 diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h index e1273454c2..fb6ec9bf20 100644 --- a/payloads/libpayload/include/stddef.h +++ b/payloads/libpayload/include/stddef.h @@ -2,6 +2,7 @@ #define _STDDEF_H #include <arch/types.h> +#include <commonlib/bsd/helpers.h> #ifndef __WCHAR_TYPE__ #define __WCHAR_TYPE__ int @@ -22,22 +23,6 @@ typedef __SIZE_TYPE__ size_t; typedef __SIZE_TYPE__ ssize_t; #undef unsigned -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) -#define member_size(TYPE, MEMBER) (sizeof(((TYPE *) 0)->MEMBER)) - -#define check_member(structure, member, offset) _Static_assert( \ - offsetof(struct structure, member) == offset, \ - "`struct " #structure "` offset for `" #member "` is not " #offset) - -/* Standard units. */ -#define KiB (1 << 10) -#define MiB (1 << 20) -#define GiB (1 << 30) - -#define KHz (1000) -#define MHz (1000*KHz) -#define GHz (1000*MHz) - #define NSECS_PER_SEC 1000000000 #define USECS_PER_SEC 1000000 #define MSECS_PER_SEC 1000 diff --git a/payloads/libpayload/include/stdlib.h b/payloads/libpayload/include/stdlib.h index eb014f4533..18f1dca8a4 100644 --- a/payloads/libpayload/include/stdlib.h +++ b/payloads/libpayload/include/stdlib.h @@ -34,12 +34,6 @@ #include <stddef.h> #include <string.h> -#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1UL) -#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) -#define ALIGN_UP(x,a) ALIGN((x),(a)) -#define ALIGN_DOWN(x,a) ((x) & ~((typeof(x))(a)-1UL)) -#define IS_ALIGNED(x,a) (((x) & ((typeof(x))(a)-1UL)) == 0) - /** * @defgroup malloc Memory allocation functions * @{ diff --git a/src/commonlib/bsd/include/commonlib/bsd/helpers.h b/src/commonlib/bsd/include/commonlib/bsd/helpers.h index 733b05a8f1..49953055b0 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/helpers.h +++ b/src/commonlib/bsd/include/commonlib/bsd/helpers.h @@ -126,4 +126,10 @@ #define retry(attempts, condition, ...) \ _retry_impl(attempts, condition, __VA_ARGS__) +/* Stringify a token */ +#ifndef STRINGIFY +#define _STRINGIFY(x) #x +#define STRINGIFY(x) _STRINGIFY(x) +#endif + #endif /* COMMONLIB_BSD_HELPERS_H */ diff --git a/src/include/string.h b/src/include/string.h index 3cfa18d33c..f595c7ed2e 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -7,12 +7,6 @@ #include <stddef.h> #include <stdio.h> -/* Stringify a token */ -#ifndef STRINGIFY -#define _STRINGIFY(x) #x -#define STRINGIFY(x) _STRINGIFY(x) -#endif - void *memcpy(void *dest, const void *src, size_t n); void *memmove(void *dest, const void *src, size_t n); void *memset(void *s, int c, size_t n); |