gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2018-05-20 12:28:10 +02:00
commit 362f034c1b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lj_obj.h
View File

@ -942,14 +942,22 @@ static LJ_AINLINE int32_t lj_num2bit(lua_Number n)
#define lj_num2int(n) ((int32_t)(n)) #define lj_num2int(n) ((int32_t)(n))
/*
** This must match the JIT backend behavior. In particular for archs
** that don't have a common hardware instruction for this conversion.
** Note that signed FP to unsigned int conversions have an undefined
** result and should never be relied upon in portable FFI code.
** See also: C99 or C11 standard, 6.3.1.4, footnote of (1).
*/
static LJ_AINLINE uint64_t lj_num2u64(lua_Number n) static LJ_AINLINE uint64_t lj_num2u64(lua_Number n)
{ {
#ifdef _MSC_VER #if LJ_TARGET_X86ORX64 || LJ_TARGET_MIPS
if (n >= 9223372036854775808.0) /* They think it's a feature. */ int64_t i = (int64_t)n;
return (uint64_t)(int64_t)(n - 18446744073709551616.0); if (i < 0) i = (int64_t)(n - 18446744073709551616.0);
else return (uint64_t)i;
#else
return (uint64_t)n;
#endif #endif
return (uint64_t)n;
} }
static LJ_AINLINE int32_t numberVint(cTValue *o) static LJ_AINLINE int32_t numberVint(cTValue *o)