fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the Windows x86 MSVC build

Browse source 
Fixes: https://github.com/quickjs-ng/quickjs/issues/430
This commit is contained in:
startewho 2024-06-15 21:04:42 +08:00 committed by Saúl Ibarra Corretgé
parent c98d445b63
commit a008f1c098
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cutils.h
View file

@ -203,9 +203,16 @@ static inline int clz32(unsigned int a)
static inline int clz64(uint64_t a) static inline int clz64(uint64_t a)
{ {
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
#if INTPTR_MAX == INT64_MAX
unsigned long index; unsigned long index;
_BitScanReverse64(&index, a); _BitScanReverse64(&index, a);
return 63 - index; return 63 - index;
#else
if (a >> 32)
return clz32((unsigned)(a >> 32));
else
return clz32((unsigned)a) + 32;
#endif
#else #else
return __builtin_clzll(a); return __builtin_clzll(a);
#endif #endif

8
tests/test_conv.c
View file

@ -94,14 +94,20 @@ static inline int clz32(unsigned int a)
static inline int clz64(uint64_t a) static inline int clz64(uint64_t a)
{ {
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
#if INTPTR_MAX == INT64_MAX
unsigned long index; unsigned long index;
_BitScanReverse64(&index, a); _BitScanReverse64(&index, a);
return 63 - index; return 63 - index;
#else
if (a >> 32)
return clz32((unsigned)(a >> 32));
else
return clz32((unsigned)a) + 32;
#endif
#else #else
return __builtin_clzll(a); return __builtin_clzll(a);
#endif #endif
} }
// prototypes for final functions // prototypes for final functions
extern char const digits36[36]; extern char const digits36[36];
size_t u32toa(char buf[minimum_length(11)], uint32_t n); size_t u32toa(char buf[minimum_length(11)], uint32_t n);