code002lover/Wasynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix i64 bit shifting

Browse Source
This commit is contained in:
Rerumu 2022-07-02 05:15:15 -04:00
parent 971ac382a5
commit 9eb44f0ed8
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
codegen/luau/runtime/numeric_tb.lua
View File

@ -226,9 +226,11 @@ function Numeric.bit_xor(lhs, rhs)
end end
function Numeric.shift_left(lhs, rhs) function Numeric.shift_left(lhs, rhs)
local count = into_u64(rhs) local count = rhs[1] % 64
if count < 32 then if count == 0 then
return lhs
elseif count < 32 then
local pad = 32 - count local pad = 32 - count
local data_1 = bit_lshift(lhs[1], count) local data_1 = bit_lshift(lhs[1], count)
@ -241,9 +243,11 @@ function Numeric.shift_left(lhs, rhs)
end end
function Numeric.shift_right_unsigned(lhs, rhs) function Numeric.shift_right_unsigned(lhs, rhs)
local count = into_u64(rhs) local count = rhs[1] % 64
if count < 32 then if count == 0 then
return lhs
elseif count < 32 then
local data_1 = bit_replace(bit_rshift(lhs[1], count), lhs[2], 32 - count, count) local data_1 = bit_replace(bit_rshift(lhs[1], count), lhs[2], 32 - count, count)
local data_2 = bit_rshift(lhs[2], count) local data_2 = bit_rshift(lhs[2], count)
@ -254,16 +258,18 @@ function Numeric.shift_right_unsigned(lhs, rhs)
end end
function Numeric.shift_right_signed(lhs, rhs) function Numeric.shift_right_signed(lhs, rhs)
local count = into_u64(rhs) local count = rhs[1] % 64
if count < 32 then if count == 0 then
return lhs
elseif count < 32 then
local data_1 = bit_replace(bit_rshift(lhs[1], count), lhs[2], 32 - count, count) local data_1 = bit_replace(bit_rshift(lhs[1], count), lhs[2], 32 - count, count)
local data_2 = bit_arshift(lhs[2], count) local data_2 = bit_arshift(lhs[2], count)
return from_u32(data_1, data_2) return from_u32(data_1, data_2)
else else
local data_1 = bit_arshift(lhs[2], count - 32) local data_1 = bit_arshift(lhs[2], count - 32)
local data_2 = lhs[2] > 0x80000000 and 0xFFFFFFFF or 0 local data_2 = lhs[2] >= 0x80000000 and 0xFFFFFFFF or 0
return from_u32(data_1, data_2) return from_u32(data_1, data_2)
end end

20
codegen/luau/runtime/numeric_v3.lua
View File

@ -251,9 +251,11 @@ function Numeric.bit_xor(lhs, rhs)
end end
function Numeric.shift_left(lhs, rhs) function Numeric.shift_left(lhs, rhs)
local count = into_u64(rhs) local count = rhs.X % 64
if count < 32 then if count == 0 then
return lhs
elseif count < 32 then
local pad = 32 - count local pad = 32 - count
local lhs_1, lhs_2 = load_d1(lhs), load_d2(lhs) local lhs_1, lhs_2 = load_d1(lhs), load_d2(lhs)
@ -269,9 +271,11 @@ function Numeric.shift_left(lhs, rhs)
end end
function Numeric.shift_right_unsigned(lhs, rhs) function Numeric.shift_right_unsigned(lhs, rhs)
local count = into_u64(rhs) local count = rhs.X % 64
if count < 32 then if count == 0 then
return lhs
elseif count < 32 then
local lhs_1, lhs_2 = load_d1(lhs), load_d2(lhs) local lhs_1, lhs_2 = load_d1(lhs), load_d2(lhs)
local data_1 = bit_replace(bit_rshift(lhs_1, count), lhs_2, 32 - count, count) local data_1 = bit_replace(bit_rshift(lhs_1, count), lhs_2, 32 - count, count)
@ -286,9 +290,11 @@ function Numeric.shift_right_unsigned(lhs, rhs)
end end
function Numeric.shift_right_signed(lhs, rhs) function Numeric.shift_right_signed(lhs, rhs)
local count = into_u64(rhs) local count = rhs.X % 64
if count < 32 then if count == 0 then
return lhs
elseif count < 32 then
local lhs_1, lhs_2 = load_d1(lhs), load_d2(lhs) local lhs_1, lhs_2 = load_d1(lhs), load_d2(lhs)
local data_1 = bit_replace(bit_rshift(lhs_1, count), lhs_2, 32 - count, count) local data_1 = bit_replace(bit_rshift(lhs_1, count), lhs_2, 32 - count, count)
@ -299,7 +305,7 @@ function Numeric.shift_right_signed(lhs, rhs)
local lhs_2 = load_d2(lhs) local lhs_2 = load_d2(lhs)
local data_1 = bit_arshift(lhs_2, count - 32) local data_1 = bit_arshift(lhs_2, count - 32)
local data_2 = lhs_2 > 0x80000000 and 0xFFFFFFFF or 0 local data_2 = lhs_2 >= 0x80000000 and 0xFFFFFFFF or 0
return from_u32(data_1, data_2) return from_u32(data_1, data_2)
end end