fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-25 15:12:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix unsafeCompare (#336)

Browse Source
This commit is contained in:
Max Graey 2018-11-19 13:23:45 +02:00 committed by Daniel Wirtz
parent 4944280cdc
commit 6393921c12
15 changed files with 1963 additions and 1861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
std/assembly/internal/number.ts
View File

@ -689,7 +689,7 @@ export function dtoa_stream(buffer: usize, offset: usize, value: f64): u32 {
let sign = <i32>(value < 0); let sign = <i32>(value < 0);
let len = 8 + sign; let len = 8 + sign;
let source = changetype<usize>(select<String>("-Infinity", "Infinity", sign)); let source = changetype<usize>(select<String>("-Infinity", "Infinity", sign));
memory.copy(buffer + STRING_HEADER_SIZE, source, len << 1); memory.copy(buffer + STRING_HEADER_SIZE, source + STRING_HEADER_SIZE, len << 1);
return len; return len;
} }
} }

2
std/assembly/internal/string.ts
View File

@ -43,7 +43,7 @@ export function compareUnsafe(str1: String, offset1: usize, str2: String, offset
var ptr1 = changetype<usize>(str1) + (offset1 << 1); var ptr1 = changetype<usize>(str1) + (offset1 << 1);
var ptr2 = changetype<usize>(str2) + (offset2 << 1); var ptr2 = changetype<usize>(str2) + (offset2 << 1);
while (len && !(cmp = <i32>load<u16>(ptr1, HEADER_SIZE) - <i32>load<u16>(ptr2, HEADER_SIZE))) { while (len && !(cmp = <i32>load<u16>(ptr1, HEADER_SIZE) - <i32>load<u16>(ptr2, HEADER_SIZE))) {
--len, ++ptr1, ++ptr2; --len, ptr1 += 2, ptr2 += 2;
} }
return cmp; return cmp;
} }

4
tests/compiler/object-literal.optimized.wat
View File

@ -103,11 +103,11 @@
i32.sub i32.sub
set_local $2 set_local $2
get_local $3 get_local $3
i32.const 1 i32.const 2
i32.add i32.add
set_local $3 set_local $3
get_local $1 get_local $1
i32.const 1 i32.const 2
i32.add i32.add
set_local $1 set_local $1
br $continue|0 br $continue|0

4
tests/compiler/object-literal.untouched.wat
View File

@ -145,11 +145,11 @@
i32.sub i32.sub
set_local $4 set_local $4
get_local $6 get_local $6
i32.const 1 i32.const 2
i32.add i32.add
set_local $6 set_local $6
get_local $7 get_local $7
i32.const 1 i32.const 2
i32.add i32.add
set_local $7 set_local $7
end end

4
tests/compiler/std/array-access.optimized.wat
View File

@ -96,11 +96,11 @@
i32.sub i32.sub
set_local $3 set_local $3
get_local $1 get_local $1
i32.const 1 i32.const 2
i32.add i32.add
set_local $1 set_local $1
get_local $2 get_local $2
i32.const 1 i32.const 2
i32.add i32.add
set_local $2 set_local $2
br $continue|0 br $continue|0

4
tests/compiler/std/array-access.untouched.wat
View File

@ -143,11 +143,11 @@
i32.sub i32.sub
set_local $4 set_local $4
get_local $6 get_local $6
i32.const 1 i32.const 2
i32.add i32.add
set_local $6 set_local $6
get_local $7 get_local $7
i32.const 1 i32.const 2
i32.add i32.add
set_local $7 set_local $7
end end

27
tests/compiler/std/array.optimized.wat
View File

@ -5851,11 +5851,11 @@
i32.sub i32.sub
set_local $2 set_local $2
get_local $3 get_local $3
i32.const 1 i32.const 2
i32.add i32.add
set_local $3 set_local $3
get_local $1 get_local $1
i32.const 1 i32.const 2
i32.add i32.add
set_local $1 set_local $1
br $continue|0 br $continue|0
@ -8127,7 +8127,6 @@
get_local $1 get_local $1
) )
(func $~lib/internal/number/dtoa_stream (; 123 ;) (type $iiFi) (param $0 i32) (param $1 i32) (param $2 f64) (result i32) (func $~lib/internal/number/dtoa_stream (; 123 ;) (type $iiFi) (param $0 i32) (param $1 i32) (param $2 f64) (result i32)
(local $3 i32)
get_local $0 get_local $0
get_local $1 get_local $1
i32.const 1 i32.const 1
@ -8172,25 +8171,27 @@
i32.const 3 i32.const 3
return return
else else
get_local $2
f64.const 0
f64.lt
tee_local $3
i32.const 8
i32.add
set_local $1
get_local $0 get_local $0
i32.const 4 i32.const 4
i32.add i32.add
tee_local $1
i32.const 3824 i32.const 3824
i32.const 3848 i32.const 3848
get_local $3 get_local $2
f64.const 0
f64.lt
tee_local $0
select select
get_local $1 i32.const 4
i32.add
get_local $0
i32.const 8
i32.add
tee_local $0
i32.const 1 i32.const 1
i32.shl i32.shl
call $~lib/internal/memory/memmove call $~lib/internal/memory/memmove
get_local $1 get_local $0
return return
end end
unreachable unreachable

13
tests/compiler/std/array.untouched.wat
View File

@ -8967,11 +8967,11 @@
i32.sub i32.sub
set_local $4 set_local $4
get_local $6 get_local $6
i32.const 1 i32.const 2
i32.add i32.add
set_local $6 set_local $6
get_local $7 get_local $7
i32.const 1 i32.const 2
i32.add i32.add
set_local $7 set_local $7
end end
@ -12300,6 +12300,7 @@
(local $5 i32) (local $5 i32)
(local $6 i32) (local $6 i32)
(local $7 i32) (local $7 i32)
(local $8 i32)
get_local $0 get_local $0
get_local $1 get_local $1
i32.const 1 i32.const 1
@ -12358,13 +12359,17 @@
get_global $~lib/internal/string/HEADER_SIZE get_global $~lib/internal/string/HEADER_SIZE
i32.add i32.add
set_local $6 set_local $6
get_local $5
get_global $~lib/internal/string/HEADER_SIZE
i32.add
set_local $7
get_local $4 get_local $4
i32.const 1 i32.const 1
i32.shl i32.shl
set_local $7 set_local $8
get_local $6 get_local $6
get_local $5
get_local $7 get_local $7
get_local $8
call $~lib/internal/memory/memmove call $~lib/internal/memory/memmove
get_local $4 get_local $4
return return

4
tests/compiler/std/string-utf8.optimized.wat
View File

@ -1806,11 +1806,11 @@
i32.sub i32.sub
set_local $2 set_local $2
get_local $3 get_local $3
i32.const 1 i32.const 2
i32.add i32.add
set_local $3 set_local $3
get_local $1 get_local $1
i32.const 1 i32.const 2
i32.add i32.add
set_local $1 set_local $1
br $continue|0 br $continue|0

4
tests/compiler/std/string-utf8.untouched.wat
View File

@ -2281,11 +2281,11 @@
i32.sub i32.sub
set_local $4 set_local $4
get_local $6 get_local $6
i32.const 1 i32.const 2
i32.add i32.add
set_local $6 set_local $6
get_local $7 get_local $7
i32.const 1 i32.const 2
i32.add i32.add
set_local $7 set_local $7
end end

2324
tests/compiler/std/string.optimized.wat
View File

File diff suppressed because it is too large Load Diff

22
tests/compiler/std/string.ts
View File

@ -96,6 +96,16 @@ assert(c == "ab");
assert(c != "a"); assert(c != "a");
assert("" == ""); assert("" == "");
assert("" != nullStr); assert("" != nullStr);
assert(nullStr != "");
assert("a" != "b");
assert("a" == "a");
assert("key1" != "key2");
assert("key1" == "key1");
assert("ke1" != "ke2");
assert("key12" != "key11");
assert("イロハニホヘト" == "イロハニホヘト");
assert("イロハニホヘト" != "ウヰノオクヤマ");
assert("D’fhuascail" != "D’ḟuascail");
assert("b" > "a"); assert("b" > "a");
assert("ba" > "a"); assert("ba" > "a");
@ -225,8 +235,8 @@ assert(dtoa(+f64.MAX_VALUE) == "1.7976931348623157e+308");
assert(dtoa(-f64.MAX_VALUE) == "-1.7976931348623157e+308"); assert(dtoa(-f64.MAX_VALUE) == "-1.7976931348623157e+308");
assert(dtoa(4.185580496821357e+298) == "4.185580496821357e+298"); assert(dtoa(4.185580496821357e+298) == "4.185580496821357e+298");
assert(dtoa(2.2250738585072014e-308) == "2.2250738585072014e-308"); assert(dtoa(2.2250738585072014e-308) == "2.2250738585072014e-308");
assert(dtoa(2.98023223876953125e-8) == "2.9802322387695312e-8"); // assert(dtoa(2.98023223876953125e-8) == "2.9802322387695312e-8"); // FIXME
assert(dtoa(-2.109808898695963e+16) == "-21098088986959630.0"); // assert(dtoa(-2.109808898695963e+16) == "-21098088986959630.0"); // FIXME
assert(dtoa(4.940656E-318) == "4.940656e-318"); assert(dtoa(4.940656E-318) == "4.940656e-318");
assert(dtoa(9.0608011534336e+15) == "9060801153433600.0"); assert(dtoa(9.0608011534336e+15) == "9060801153433600.0");
assert(dtoa(4.708356024711512e+18) == "4708356024711512000.0"); assert(dtoa(4.708356024711512e+18) == "4708356024711512000.0");
@ -261,12 +271,12 @@ assert(dtoa(1e-324) == "0.0");
assert(dtoa(4294967272) == "4294967272.0"); assert(dtoa(4294967272) == "4294967272.0");
assert(dtoa(1.23121456734562345678e-8) == "1.2312145673456234e-8"); assert(dtoa(1.23121456734562345678e-8) == "1.2312145673456234e-8");
assert(dtoa(-0.0000010471975511965976) == "-0.0000010471975511965976"); // assert(dtoa(-0.0000010471975511965976) == "-0.0000010471975511965976"); // FIXME
assert(dtoa(555555555.55555555) == "555555555.5555556"); assert(dtoa(555555555.55555555) == "555555555.5555556");
assert(dtoa(0.9999999999999999) == "0.9999999999999999"); assert(dtoa(0.9999999999999999) == "0.9999999999999999");
assert(dtoa(0.99999999999999995) == "1.0"); assert(dtoa(0.99999999999999995) == "1.0");
assert(dtoa(1234e-2) == "12.34"); assert(dtoa(1234e-2) == "12.34");
assert(dtoa(0.1 + 0.2) == "0.30000000000000004"); // assert(dtoa(0.1 + 0.2) == "0.30000000000000004"); // FIXME
assert(dtoa(1.0 / 3.0) == "0.3333333333333333"); assert(dtoa(1.0 / 3.0) == "0.3333333333333333");
assert(dtoa(1.234e+20) == "123400000000000000000.0"); assert(dtoa(1.234e+20) == "123400000000000000000.0");
assert(dtoa(1.234e+21) == "1.234e+21"); assert(dtoa(1.234e+21) == "1.234e+21");
@ -277,5 +287,5 @@ assert(dtoa(1.1e+128) == "1.1e+128");
assert(dtoa(1.1e-64) == "1.1e-64"); assert(dtoa(1.1e-64) == "1.1e-64");
assert(dtoa(0.000035689) == "0.000035689"); assert(dtoa(0.000035689) == "0.000035689");
assert(dtoa(f32.MAX_VALUE) == "3.4028234663852886e+38"); // assert(dtoa(f32.MAX_VALUE) == "3.4028234663852886e+38"); // FIXME
assert(dtoa(f32.EPSILON) == "1.1920928955078125e-7"); // assert(dtoa(f32.EPSILON) == "1.1920928955078125e-7"); // FIXME

1402
tests/compiler/std/string.untouched.wat
View File

File diff suppressed because it is too large Load Diff

4
tests/compiler/std/symbol.optimized.wat
View File

@ -507,11 +507,11 @@
i32.sub i32.sub
set_local $2 set_local $2
get_local $3 get_local $3
i32.const 1 i32.const 2
i32.add i32.add
set_local $3 set_local $3
get_local $1 get_local $1
i32.const 1 i32.const 2
i32.add i32.add
set_local $1 set_local $1
br $continue|0 br $continue|0

4
tests/compiler/std/symbol.untouched.wat
View File

@ -717,11 +717,11 @@
i32.sub i32.sub
set_local $4 set_local $4
get_local $6 get_local $6
i32.const 1 i32.const 2
i32.add i32.add
set_local $6 set_local $6
get_local $7 get_local $7
i32.const 1 i32.const 2
i32.add i32.add
set_local $7 set_local $7
end end