diff options
| author | Yves Orton <demerphq@gmail.com> | 2021-02-12 23:13:56 +0100 |
|---|---|---|
| committer | Yves Orton <demerphq@gmail.com> | 2021-02-13 09:13:40 +0100 |
| commit | f43079cb514e3d0be0036424695438ae3fb58451 (patch) | |
| tree | a695e7b888b0a068c86b99c2dd390b5f2cc3ee6a /hv_func.h | |
| parent | 64901762e5e760756c8a2f3d72e81a16d2213c53 (diff) | |
| download | perl-f43079cb514e3d0be0036424695438ae3fb58451.tar.gz | |
[#18555] Ensure that PL_hash_seed and PL_hash_state are word aligned
Replace PL_hash_seed and PL_hash_state with PL_hash_seed_w and
PL_hash_state_w, and replace the old vars with defines that cast
their replacements appropriately. This should force linkers to
word align the data.
Diffstat (limited to 'hv_func.h')
| -rw-r--r-- | hv_func.h | 36 |
1 files changed, 24 insertions, 12 deletions
@@ -36,21 +36,24 @@ #if defined(PERL_HASH_FUNC_SIPHASH) # define __PERL_HASH_FUNC "SIPHASH_2_4" -# define __PERL_HASH_WORD_SIZE sizeof(U64) +# define __PERL_HASH_WORD_TYPE U64 +# define __PERL_HASH_WORD_SIZE sizeof(__PERL_HASH_WORD_TYPE) # define __PERL_HASH_SEED_BYTES (__PERL_HASH_WORD_SIZE * 2) # define __PERL_HASH_STATE_BYTES (__PERL_HASH_WORD_SIZE * 4) # define __PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) # define __PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_2_4_with_state((state),(U8*)(str),(len)) #elif defined(PERL_HASH_FUNC_SIPHASH13) # define __PERL_HASH_FUNC "SIPHASH_1_3" -# define __PERL_HASH_WORD_SIZE sizeof(U64) +# define __PERL_HASH_WORD_TYPE U64 +# define __PERL_HASH_WORD_SIZE sizeof(__PERL_HASH_WORD_TYPE) # define __PERL_HASH_SEED_BYTES (__PERL_HASH_WORD_SIZE * 2) # define __PERL_HASH_STATE_BYTES (__PERL_HASH_WORD_SIZE * 4) # define __PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) # define __PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_1_3_with_state((state),(U8*)(str),(len)) #elif defined(PERL_HASH_FUNC_STADTX) # define __PERL_HASH_FUNC "STADTX" -# define __PERL_HASH_WORD_SIZE sizeof(U64) +# define __PERL_HASH_WORD_TYPE U64 +# define __PERL_HASH_WORD_SIZE sizeof(__PERL_HASH_WORD_TYPE) # define __PERL_HASH_SEED_BYTES (__PERL_HASH_WORD_SIZE * 2) # define __PERL_HASH_STATE_BYTES (__PERL_HASH_WORD_SIZE * 4) # define __PERL_HASH_SEED_STATE(seed,state) stadtx_seed_state(seed,state) @@ -58,7 +61,8 @@ # include "stadtx_hash.h" #elif defined(PERL_HASH_FUNC_ZAPHOD32) # define __PERL_HASH_FUNC "ZAPHOD32" -# define __PERL_HASH_WORD_SIZE sizeof(U32) +# define __PERL_HASH_WORD_TYPE U32 +# define __PERL_HASH_WORD_SIZE sizeof(__PERL_HASH_WORD_TYPE) # define __PERL_HASH_SEED_BYTES (__PERL_HASH_WORD_SIZE * 3) # define __PERL_HASH_STATE_BYTES (__PERL_HASH_WORD_SIZE * 3) # define __PERL_HASH_SEED_STATE(seed,state) zaphod32_seed_state(seed,state) @@ -82,6 +86,12 @@ */ #include "perl_siphash.h" +#define __PERL_HASH_SEED_roundup(x, y) ( ( ( (x) + ( (y) - 1 ) ) / (y) ) * (y) ) +#define _PERL_HASH_SEED_roundup(x) __PERL_HASH_SEED_roundup(x,__PERL_HASH_WORD_SIZE) + +#define PL_hash_seed ((U8 *)PL_hash_seed_w) +#define PL_hash_state ((U8 *)PL_hash_state_w) + #if PERL_HASH_USE_SBOX32_ALSO != 1 # define _PERL_HASH_FUNC __PERL_HASH_FUNC # define _PERL_HASH_SEED_BYTES __PERL_HASH_SEED_BYTES @@ -91,10 +101,8 @@ #else #define _PERL_HASH_FUNC "SBOX32_WITH_" __PERL_HASH_FUNC -#define __PERL_HASH_SEED_roundup(x, y) ((((x)+((y)-1))/(y))*(y)) -#define _PERL_HASH_SEED_roundup(x) __PERL_HASH_SEED_roundup(x,__PERL_HASH_WORD_SIZE) /* note the 3 in the below code comes from the fact the seed to initialize the SBOX is 96 bits */ -#define _PERL_HASH_SEED_BYTES ( _PERL_HASH_SEED_roundup(__PERL_HASH_SEED_BYTES + (int)( 3 * sizeof(U32)) ) ) +#define _PERL_HASH_SEED_BYTES ( __PERL_HASH_SEED_BYTES + (int)( 3 * sizeof(U32)) ) #define _PERL_HASH_STATE_BYTES \ ( __PERL_HASH_STATE_BYTES + ( ( 1 + ( 256 * SBOX32_MAX_LEN ) ) * sizeof(U32) ) ) @@ -115,11 +123,15 @@ (hash) = S_perl_hash_with_seed((const U8 *) seed, (const U8 *) str,len) #define PERL_HASH_WITH_STATE(state,hash,str,len) \ (hash) = _PERL_HASH_WITH_STATE((state),(U8*)(str),(len)) + #define PERL_HASH_SEED_STATE(seed,state) _PERL_HASH_SEED_STATE(seed,state) -#define PERL_HASH_SEED_BYTES _PERL_HASH_SEED_BYTES -#define PERL_HASH_STATE_BYTES _PERL_HASH_STATE_BYTES +#define PERL_HASH_SEED_BYTES _PERL_HASH_SEED_roundup(_PERL_HASH_SEED_BYTES) +#define PERL_HASH_STATE_BYTES _PERL_HASH_SEED_roundup(_PERL_HASH_STATE_BYTES) #define PERL_HASH_FUNC _PERL_HASH_FUNC +#define PERL_HASH_SEED_WORDS (PERL_HASH_SEED_BYTES/__PERL_HASH_WORD_SIZE) +#define PERL_HASH_STATE_WORDS (PERL_HASH_STATE_BYTES/__PERL_HASH_WORD_SIZE) + #ifdef PERL_USE_SINGLE_CHAR_HASH_CACHE #define PERL_HASH(state,str,len) \ (hash) = ((len) < 2 ? ( (len) == 0 ? PL_hash_chars[256] : PL_hash_chars[(U8)(str)[0]] ) \ @@ -160,9 +172,9 @@ PERL_STATIC_INLINE U32 S_perl_hash_with_seed(const U8 * seed, const U8 *str, STRLEN len) { - U8 state[_PERL_HASH_STATE_BYTES]; - _PERL_HASH_SEED_STATE(seed,state); - return _PERL_HASH_WITH_STATE(state,str,len); + __PERL_HASH_WORD_TYPE state[PERL_HASH_STATE_WORDS]; + _PERL_HASH_SEED_STATE(seed,(U8*)state); + return _PERL_HASH_WITH_STATE((U8*)state,str,len); } #endif /*compile once*/ |