diff options
| author | David Timber <mieabby@gmail.com> | 2020-08-24 09:37:43 +0930 |
|---|---|---|
| committer | David Timber <mieabby@gmail.com> | 2020-08-24 10:05:29 +0930 |
| commit | acf0b7a45171555eba2c10a6ef84f915c62f6791 (patch) | |
| tree | 7253e8d86a199948530671c8bf59ecbb2c6e08f8 /src/util_ct.h | |
| parent | 076671e7aa28451de087088c2e47f9e6064ae434 (diff) | |
* htbt checkpoint
* Change PRNE_BUILD_ENTROPY to uint8_t array
* endian.h problem
* Remove "-I." CFLAG added by Automake ()
* Moved endian conversion macros to endian.h
* Moved DNS server config from config.h to resolv.h to reduce compile time
* Refactor resolv_ensure_act_dns_fd() to reduce binary size
Diffstat (limited to 'src/util_ct.h')
| -rw-r--r-- | src/util_ct.h | 72 |
1 files changed, 3 insertions, 69 deletions
diff --git a/src/util_ct.h b/src/util_ct.h index 4f40949..16d4157 100644 --- a/src/util_ct.h +++ b/src/util_ct.h @@ -13,11 +13,11 @@ #define prne_op_max(a, b) ((a) > (b) ? (a) : (b)) #define prne_op_spaceship(a, b) ((a) == (b) ? 0 : (a) < (b) ? -1 : 1) -#define prne_salign_next(x, align) (((x) % align == 0) ? (x) : ((x) / align + 1) * align) -#define prne_salign_at(x, align) (((x) % align == 0) ? (x) : ((x) / align) * align) +#define prne_salign_next(x, align) (((x) % (align) == 0) ? (x) : ((x) / (align) + 1) * (align)) +#define prne_salign_at(x, align) (((x) % (align) == 0) ? (x) : ((x) / (align)) * (align)) #if !defined(memzero) -#define memzero(addr, len) memset(addr, 0, len) +#define memzero(addr, len) memset((addr), 0, (len)) #endif #ifdef PRNE_DEBUG @@ -44,69 +44,3 @@ #define prne_dbgast(expr) #define prne_dbgmast(expr, ...) #endif - -/********************************************************************** -* Endianess Independent Byte Extraction -***********************************************************************/ -/* prne_getmsbN(x, n) -* -* Extract nth most significant byte of x. -*/ -#define prne_getmsb(x, n, w, s)\ - (uint8_t)(((w)(x) & (w)0xFF << (s - 8 * (n))) >> (s - 8 * (n))) -#define prne_getmsb64(x, n) prne_getmsb((x), (n), uint_fast64_t, 56) -#define prne_getmsb32(x, n) prne_getmsb((x), (n), uint_fast32_t, 24) -#define prne_getmsb16(x, n) prne_getmsb((x), (n), uint_fast16_t, 8) - -/* prne_recmb_msbN(...) -* -* Recombine bytes in big-endian order to uintN. -*/ -#define prne_recmb_msb64(a, b, c, d, e, f, g, h) (\ - ((uint_fast64_t)(a) << 56) |\ - ((uint_fast64_t)(b) << 48) |\ - ((uint_fast64_t)(c) << 40) |\ - ((uint_fast64_t)(d) << 32) |\ - ((uint_fast64_t)(e) << 24) |\ - ((uint_fast64_t)(f) << 16) |\ - ((uint_fast64_t)(g) << 8) |\ - ((uint_fast64_t)(h) << 0)\ -) -#define prne_recmb_msb32(a, b, c, d) (\ - ((uint_fast32_t)(a) << 24) |\ - ((uint_fast32_t)(b) << 16) |\ - ((uint_fast32_t)(c) << 8) |\ - ((uint_fast32_t)(d) << 0)\ -) -#define prne_recmb_msb16(a, b) (\ - ((uint_fast16_t)(a) << 8) |\ - ((uint_fast16_t)(b) << 0)\ -) - -/* Machine Characteristics -*/ -#define PRNE_ENDIAN_LITTLE 1 -#define PRNE_ENDIAN_BIG 2 - -#ifdef __GNUC__ - #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - #define PRNE_HOST_ENDIAN PRNE_ENDIAN_BIG - #elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define PRNE_HOST_ENDIAN PRNE_ENDIAN_LITTLE - #else - #error "FIXME!" - #endif -#else - #error "FIXME!" -#endif - -#define prne_einv16(x) (((0xFF00 & x) >> 8) | ((0x00FF & x) << 8)) - -#if PRNE_HOST_ENDIAN == PRNE_ENDIAN_BIG -#define prne_htobe16(x) (x) -#define prne_be16toh(x) (x) -#elif PRNE_HOST_ENDIAN == PRNE_ENDIAN_LITTLE -#define prne_htobe16(x) prne_einv16(x) -#define prne_be16toh(x) prne_einv16(x) -#else -#endif |