diff options
-rw-r--r-- | hv_func.h | 108 | ||||
-rw-r--r-- | perlvars.h | 4 |
2 files changed, 56 insertions, 56 deletions
@@ -34,40 +34,40 @@ #include "sbox32_hash.h" #if defined(PERL_HASH_FUNC_SIPHASH) -# define __PERL_HASH_FUNC "SIPHASH_2_4" -# 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)) +# define PVT__PERL_HASH_FUNC "SIPHASH_2_4" +# define PVT__PERL_HASH_WORD_TYPE U64 +# define PVT__PERL_HASH_WORD_SIZE sizeof(PVT__PERL_HASH_WORD_TYPE) +# define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 2) +# define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 4) +# define PVT__PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) +# define PVT__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_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)) +# define PVT__PERL_HASH_FUNC "SIPHASH_1_3" +# define PVT__PERL_HASH_WORD_TYPE U64 +# define PVT__PERL_HASH_WORD_SIZE sizeof(PVT__PERL_HASH_WORD_TYPE) +# define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 2) +# define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 4) +# define PVT__PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) +# define PVT__PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_1_3_with_state((state),(U8*)(str),(len)) #elif defined(PERL_HASH_FUNC_ZAPHOD32) -# define __PERL_HASH_FUNC "ZAPHOD32" -# 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) -# define __PERL_HASH_WITH_STATE(state,str,len) (U32)zaphod32_hash_with_state((state),(U8*)(str),(len)) +# define PVT__PERL_HASH_FUNC "ZAPHOD32" +# define PVT__PERL_HASH_WORD_TYPE U32 +# define PVT__PERL_HASH_WORD_SIZE sizeof(PVT__PERL_HASH_WORD_TYPE) +# define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 3) +# define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 3) +# define PVT__PERL_HASH_SEED_STATE(seed,state) zaphod32_seed_state(seed,state) +# define PVT__PERL_HASH_WITH_STATE(state,str,len) (U32)zaphod32_hash_with_state((state),(U8*)(str),(len)) # include "zaphod32_hash.h" #endif -#ifndef __PERL_HASH_WITH_STATE +#ifndef PVT__PERL_HASH_WITH_STATE #error "No hash function defined!" #endif -#ifndef __PERL_HASH_SEED_BYTES -#error "__PERL_HASH_SEED_BYTES not defined" +#ifndef PVT__PERL_HASH_SEED_BYTES +#error "PVT__PERL_HASH_SEED_BYTES not defined" #endif -#ifndef __PERL_HASH_FUNC -#error "__PERL_HASH_FUNC not defined" +#ifndef PVT__PERL_HASH_FUNC +#error "PVT__PERL_HASH_FUNC not defined" #endif /* Some siphash static functions are needed by XS::APItest even when @@ -76,56 +76,56 @@ */ #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 PVT__PERL_HASH_SEED_roundup(x, y) ( ( ( (x) + ( (y) - 1 ) ) / (y) ) * (y) ) +#define PVT_PERL_HASH_SEED_roundup(x) PVT__PERL_HASH_SEED_roundup(x,PVT__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 -# define _PERL_HASH_STATE_BYTES __PERL_HASH_STATE_BYTES -# define _PERL_HASH_SEED_STATE(seed,state) __PERL_HASH_SEED_STATE(seed,state) -# define _PERL_HASH_WITH_STATE(state,str,len) __PERL_HASH_WITH_STATE(state,str,len) +# define PVT_PERL_HASH_FUNC PVT__PERL_HASH_FUNC +# define PVT_PERL_HASH_SEED_BYTES PVT__PERL_HASH_SEED_BYTES +# define PVT_PERL_HASH_STATE_BYTES PVT__PERL_HASH_STATE_BYTES +# define PVT_PERL_HASH_SEED_STATE(seed,state) PVT__PERL_HASH_SEED_STATE(seed,state) +# define PVT_PERL_HASH_WITH_STATE(state,str,len) PVT__PERL_HASH_WITH_STATE(state,str,len) #else -#define _PERL_HASH_FUNC "SBOX32_WITH_" __PERL_HASH_FUNC +#define PVT_PERL_HASH_FUNC "SBOX32_WITH_" PVT__PERL_HASH_FUNC /* note the 4 in the below code comes from the fact the seed to initialize the SBOX is 128 bits */ -#define _PERL_HASH_SEED_BYTES ( __PERL_HASH_SEED_BYTES + (int)( 4 * sizeof(U32)) ) +#define PVT_PERL_HASH_SEED_BYTES ( PVT__PERL_HASH_SEED_BYTES + (int)( 4 * sizeof(U32)) ) -#define _PERL_HASH_STATE_BYTES \ - ( __PERL_HASH_STATE_BYTES + ( ( 1 + ( 256 * SBOX32_MAX_LEN ) ) * sizeof(U32) ) ) +#define PVT_PERL_HASH_STATE_BYTES \ + ( PVT__PERL_HASH_STATE_BYTES + ( ( 1 + ( 256 * SBOX32_MAX_LEN ) ) * sizeof(U32) ) ) -#define _PERL_HASH_SEED_STATE(seed,state) STMT_START { \ - __PERL_HASH_SEED_STATE(seed,state); \ - sbox32_seed_state128(seed + __PERL_HASH_SEED_BYTES, state + __PERL_HASH_STATE_BYTES); \ +#define PVT_PERL_HASH_SEED_STATE(seed,state) STMT_START { \ + PVT__PERL_HASH_SEED_STATE(seed,state); \ + sbox32_seed_state128(seed + PVT__PERL_HASH_SEED_BYTES, state + PVT__PERL_HASH_STATE_BYTES); \ } STMT_END -#define _PERL_HASH_WITH_STATE(state,str,len) \ +#define PVT_PERL_HASH_WITH_STATE(state,str,len) \ (LIKELY(len <= SBOX32_MAX_LEN) \ - ? sbox32_hash_with_state((state + __PERL_HASH_STATE_BYTES),(U8*)(str),(len)) \ - : __PERL_HASH_WITH_STATE((state),(str),(len))) + ? sbox32_hash_with_state((state + PVT__PERL_HASH_STATE_BYTES),(U8*)(str),(len)) \ + : PVT__PERL_HASH_WITH_STATE((state),(str),(len))) #endif #define PERL_HASH_WITH_SEED(seed,hash,str,len) \ (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)) + (hash) = PVT_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_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_STATE(seed,state) PVT_PERL_HASH_SEED_STATE(seed,state) +#define PERL_HASH_SEED_BYTES PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_SEED_BYTES) +#define PERL_HASH_STATE_BYTES PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_STATE_BYTES) +#define PERL_HASH_FUNC PVT_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) +#define PERL_HASH_SEED_WORDS (PERL_HASH_SEED_BYTES/PVT__PERL_HASH_WORD_SIZE) +#define PERL_HASH_STATE_WORDS (PERL_HASH_STATE_BYTES/PVT__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]] ) \ - : _PERL_HASH_WITH_STATE(PL_hash_state,(U8*)(str),(len))) + : PVT_PERL_HASH_WITH_STATE(PL_hash_state,(U8*)(str),(len))) #else #define PERL_HASH(hash,str,len) \ PERL_HASH_WITH_STATE(PL_hash_state,hash,(U8*)(str),(len)) @@ -162,9 +162,9 @@ PERL_STATIC_INLINE U32 S_perl_hash_with_seed(const U8 * seed, const U8 *str, STRLEN 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); + PVT__PERL_HASH_WORD_TYPE state[PERL_HASH_STATE_WORDS]; + PVT_PERL_HASH_SEED_STATE(seed,(U8*)state); + return PVT_PERL_HASH_WITH_STATE((U8*)state,str,len); } #endif /*compile once*/ diff --git a/perlvars.h b/perlvars.h index ae52cbe00c..2f930dd631 100644 --- a/perlvars.h +++ b/perlvars.h @@ -260,9 +260,9 @@ PERLVAR(G, malloc_mutex, perl_mutex) /* Mutex for malloc */ #endif PERLVARI(G, hash_seed_set, bool, FALSE) /* perl.c */ -PERLVARA(G, hash_seed_w, PERL_HASH_SEED_WORDS, __PERL_HASH_WORD_TYPE) /* perl.c and hv.h */ +PERLVARA(G, hash_seed_w, PERL_HASH_SEED_WORDS, PVT__PERL_HASH_WORD_TYPE) /* perl.c and hv.h */ #if defined(PERL_HASH_STATE_BYTES) -PERLVARA(G, hash_state_w, PERL_HASH_STATE_WORDS, __PERL_HASH_WORD_TYPE) /* perl.c and hv.h */ +PERLVARA(G, hash_state_w, PERL_HASH_STATE_WORDS, PVT__PERL_HASH_WORD_TYPE) /* perl.c and hv.h */ #endif #if defined(PERL_USE_SINGLE_CHAR_HASH_CACHE) PERLVARA(G, hash_chars, (1+256) * sizeof(U32), unsigned char) /* perl.c and hv.h */ |