d0s3t3ch/RandomWOW
1
0
Fork 0
mirror of https://git.wownero.com/wownero/RandomWOW.git synced 2024-08-15 00:23:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix undefined behavior in rotr/rotl (#86)

Browse source
This commit is contained in:
tevador 2019-06-25 23:41:50 +02:00 committed by GitHub
parent 1f62d787ad
commit 6ea6cceb63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/instructions_portable.cpp
View file

@ -51,10 +51,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <intrin.h> #include <intrin.h>
#include <stdlib.h> #include <stdlib.h>
uint64_t rotl(uint64_t x, int c) { uint64_t rotl(uint64_t x, unsigned int c) {
return _rotl64(x, c); return _rotl64(x, c);
} }
uint64_t rotr(uint64_t x , int c) { uint64_t rotr(uint64_t x, unsigned int c) {
return _rotr64(x, c); return _rotr64(x, c);
} }
#define HAVE_ROTL #define HAVE_ROTL
@ -89,15 +89,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#ifndef HAVE_ROTR #ifndef HAVE_ROTR
uint64_t rotr(uint64_t a, int b) { uint64_t rotr(uint64_t a, unsigned int b) {
return (a >> b) | (a << (64 - b)); return (a >> b) | (a << (-b & 63));
} }
#define HAVE_ROTR #define HAVE_ROTR
#endif #endif
#ifndef HAVE_ROTL #ifndef HAVE_ROTL
uint64_t rotl(uint64_t a, int b) { uint64_t rotl(uint64_t a, unsigned int b) {
return (a << b) | (a >> (64 - b)); return (a << b) | (a >> (-b & 63));
} }
#define HAVE_ROTL #define HAVE_ROTL
#endif #endif

4
src/intrin_portable.h
View file

@ -594,5 +594,5 @@ void rx_set_rounding_mode(uint32_t mode);
double loadDoublePortable(const void* addr); double loadDoublePortable(const void* addr);
uint64_t mulh(uint64_t, uint64_t); uint64_t mulh(uint64_t, uint64_t);
int64_t smulh(int64_t, int64_t); int64_t smulh(int64_t, int64_t);
uint64_t rotl(uint64_t, int); uint64_t rotl(uint64_t, unsigned int);
uint64_t rotr(uint64_t, int); uint64_t rotr(uint64_t, unsigned int);