Rename variables for consistency
This commit is contained in:
parent
2ad52aa6b1
commit
34dbd6b018
@ -487,12 +487,12 @@ do
|
|||||||
end
|
end
|
||||||
|
|
||||||
function load.i32_i8(memory, addr)
|
function load.i32_i8(memory, addr)
|
||||||
local b = load_byte(memory.data, addr)
|
local temp = load_byte(memory.data, addr)
|
||||||
|
|
||||||
if b >= 0x80 then
|
if temp >= 0x80 then
|
||||||
return to_u32(b - 0x100)
|
return to_u32(temp - 0x100)
|
||||||
else
|
else
|
||||||
return b
|
return temp
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -502,27 +502,26 @@ do
|
|||||||
|
|
||||||
function load.i32_i16(memory, addr)
|
function load.i32_i16(memory, addr)
|
||||||
local data = memory.data
|
local data = memory.data
|
||||||
local num
|
local temp
|
||||||
|
|
||||||
if addr % 4 == 0 then
|
if addr % 4 == 0 then
|
||||||
num = bit_and(data[addr / 4] or 0, 0xFFFF)
|
temp = bit_and(data[addr / 4] or 0, 0xFFFF)
|
||||||
else
|
else
|
||||||
local b1 = load_byte(data, addr)
|
local b1 = load_byte(data, addr)
|
||||||
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
||||||
|
|
||||||
num = bit_or(b1, b2)
|
temp = bit_or(b1, b2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if num >= 0x8000 then
|
if temp >= 0x8000 then
|
||||||
return to_u32(num - 0x10000)
|
return to_u32(temp - 0x10000)
|
||||||
else
|
else
|
||||||
return num
|
return temp
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function load.i32_u16(memory, addr)
|
function load.i32_u16(memory, addr)
|
||||||
local data = memory.data
|
local data = memory.data
|
||||||
local num
|
|
||||||
|
|
||||||
if addr % 4 == 0 then
|
if addr % 4 == 0 then
|
||||||
return bit_and(data[addr / 4] or 0, 0xFFFF)
|
return bit_and(data[addr / 4] or 0, 0xFFFF)
|
||||||
@ -552,13 +551,13 @@ do
|
|||||||
end
|
end
|
||||||
|
|
||||||
function load.i64_i8(memory, addr)
|
function load.i64_i8(memory, addr)
|
||||||
local b = load_byte(memory.data, addr)
|
local temp = load_byte(memory.data, addr)
|
||||||
|
|
||||||
if b >= 0x80 then
|
if temp >= 0x80 then
|
||||||
b = to_u32(b - 0x100)
|
temp = to_u32(temp - 0x100)
|
||||||
end
|
end
|
||||||
|
|
||||||
return num_from_u32(b, 0)
|
return num_from_u32(temp, 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
function load.i64_u8(memory, addr)
|
function load.i64_u8(memory, addr)
|
||||||
@ -569,74 +568,74 @@ do
|
|||||||
|
|
||||||
function load.i64_i16(memory, addr)
|
function load.i64_i16(memory, addr)
|
||||||
local data = memory.data
|
local data = memory.data
|
||||||
local num
|
local temp
|
||||||
|
|
||||||
if addr % 4 == 0 then
|
if addr % 4 == 0 then
|
||||||
num = bit_and(data[addr / 4] or 0, 0xFFFF)
|
temp = bit_and(data[addr / 4] or 0, 0xFFFF)
|
||||||
else
|
else
|
||||||
local b1 = load_byte(data, addr)
|
local b1 = load_byte(data, addr)
|
||||||
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
||||||
|
|
||||||
num = bit_or(b1, b2)
|
temp = bit_or(b1, b2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if num >= 0x8000 then
|
if temp >= 0x8000 then
|
||||||
num = to_u32(num - 0x10000)
|
temp = to_u32(temp - 0x10000)
|
||||||
end
|
end
|
||||||
|
|
||||||
return num_from_u32(num, 0)
|
return num_from_u32(temp, 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
function load.i64_u16(memory, addr)
|
function load.i64_u16(memory, addr)
|
||||||
local data = memory.data
|
local data = memory.data
|
||||||
local num
|
local temp
|
||||||
|
|
||||||
if addr % 4 == 0 then
|
if addr % 4 == 0 then
|
||||||
num = bit_and(data[addr / 4] or 0, 0xFFFF)
|
temp = bit_and(data[addr / 4] or 0, 0xFFFF)
|
||||||
else
|
else
|
||||||
local b1 = load_byte(data, addr)
|
local b1 = load_byte(data, addr)
|
||||||
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
||||||
|
|
||||||
num = bit_or(b1, b2)
|
temp = bit_or(b1, b2)
|
||||||
end
|
end
|
||||||
|
|
||||||
return num_from_u32(num, 0)
|
return num_from_u32(temp, 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
function load.i64_i32(memory, addr)
|
function load.i64_i32(memory, addr)
|
||||||
local data = memory.data
|
local data = memory.data
|
||||||
local num
|
local temp
|
||||||
|
|
||||||
if addr % 4 == 0 then
|
if addr % 4 == 0 then
|
||||||
num = data[addr / 4] or 0
|
temp = data[addr / 4] or 0
|
||||||
else
|
else
|
||||||
local b1 = load_byte(data, addr)
|
local b1 = load_byte(data, addr)
|
||||||
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
||||||
local b3 = bit_lshift(load_byte(data, addr + 2), 16)
|
local b3 = bit_lshift(load_byte(data, addr + 2), 16)
|
||||||
local b4 = bit_lshift(load_byte(data, addr + 3), 24)
|
local b4 = bit_lshift(load_byte(data, addr + 3), 24)
|
||||||
|
|
||||||
num = bit_or(b1, b2, b3, b4)
|
temp = bit_or(b1, b2, b3, b4)
|
||||||
end
|
end
|
||||||
|
|
||||||
return num_from_u32(num, 0)
|
return num_from_u32(temp, 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
function load.i64_u32(memory, addr)
|
function load.i64_u32(memory, addr)
|
||||||
local data = memory.data
|
local data = memory.data
|
||||||
local num
|
local temp
|
||||||
|
|
||||||
if addr % 4 == 0 then
|
if addr % 4 == 0 then
|
||||||
num = data[addr / 4] or 0
|
temp = data[addr / 4] or 0
|
||||||
else
|
else
|
||||||
local b1 = load_byte(data, addr)
|
local b1 = load_byte(data, addr)
|
||||||
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
local b2 = bit_lshift(load_byte(data, addr + 1), 8)
|
||||||
local b3 = bit_lshift(load_byte(data, addr + 2), 16)
|
local b3 = bit_lshift(load_byte(data, addr + 2), 16)
|
||||||
local b4 = bit_lshift(load_byte(data, addr + 3), 24)
|
local b4 = bit_lshift(load_byte(data, addr + 3), 24)
|
||||||
|
|
||||||
num = bit_or(b1, b2, b3, b4)
|
temp = bit_or(b1, b2, b3, b4)
|
||||||
end
|
end
|
||||||
|
|
||||||
return num_from_u32(num, 0)
|
return num_from_u32(temp, 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
local load_i32 = load.i32
|
local load_i32 = load.i32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user