mirror of
https://github.com/cryb-to/cryb-to.git
synced 2024-12-18 18:44:53 +00:00
Merge pull request #7 from cryb-to/safe-rol-ror
Make rolN / rorN safe for all counts.
This commit is contained in:
commit
ae9609ddf0
1 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c) 2012 The University of Oslo
|
* Copyright (c) 2012 The University of Oslo
|
||||||
* Copyright (c) 2012-2016 Dag-Erling Smørgrav
|
* Copyright (c) 2012-2017 Dag-Erling Smørgrav
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -40,11 +40,11 @@ CRYB_BEGIN
|
||||||
#define CRYB_ROL_ROR(N) \
|
#define CRYB_ROL_ROR(N) \
|
||||||
static inline uint##N##_t rol##N(uint##N##_t i, int n) \
|
static inline uint##N##_t rol##N(uint##N##_t i, int n) \
|
||||||
{ \
|
{ \
|
||||||
return (i << n | i >> (N - n)); \
|
return (i << (n & (N - 1)) | i >> (-n & (N - 1))); \
|
||||||
} \
|
} \
|
||||||
static inline uint##N##_t ror##N(uint##N##_t i, int n) \
|
static inline uint##N##_t ror##N(uint##N##_t i, int n) \
|
||||||
{ \
|
{ \
|
||||||
return (i << (N - n) | i >> n); \
|
return (i << (-n & (N - 1)) | i >> (n & (N - 1))); \
|
||||||
}
|
}
|
||||||
|
|
||||||
CRYB_ROL_ROR(8);
|
CRYB_ROL_ROR(8);
|
||||||
|
|
Loading…
Reference in a new issue