Skip to content

Commit 729a1f9

Browse files
committed
Merge remote-tracking branch 'origin/master' into release
2 parents 51ea988 + af0ab31 commit 729a1f9

14 files changed

+1431
-1411
lines changed

Diff for: lib/loader/index.d.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/// <reference lib="esnext.bigint" />
22

3-
import "@types/webassembly-js-api";
4-
53
/** WebAssembly imports with two levels of nesting. */
64
interface ImportsObject extends Record<string, any> {
75
env?: {

Diff for: lib/loader/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"keywords": [
55
"assemblyscript",
66
"loader",
7+
"glue",
8+
"interop",
79
"webassembly",
810
"wasm"
911
],
@@ -30,8 +32,5 @@
3032
"index.js",
3133
"package.json",
3234
"README.md"
33-
],
34-
"dependencies": {
35-
"@types/webassembly-js-api": "0.0.1"
36-
}
35+
]
3736
}

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"assemblyscript",
99
"wasm"
1010
],
11-
"version": "0.8.0",
11+
"version": "0.8.1",
1212
"author": "Daniel Wirtz <[email protected]>",
1313
"contributors": [],
1414
"license": "Apache-2.0",

Diff for: std/assembly/math.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1207,9 +1207,8 @@ export namespace NativeMath {
12071207
if (iy >= 0x43400000) yisint = 2;
12081208
else if (iy >= 0x3FF00000) {
12091209
k = (iy >> 20) - 0x3FF;
1210-
let kcond = k > 20;
1211-
let offset = select<i32>(52, 20, kcond) - k;
1212-
let Ly = select<i32>(ly, iy, kcond);
1210+
let offset = select<u32>(52, 20, k > 20) - k;
1211+
let Ly = select<u32>(ly, iy, k > 20);
12131212
let jj = Ly >> offset;
12141213
if ((jj << offset) == Ly) yisint = 2 - (jj & 1);
12151214
}
@@ -2206,6 +2205,7 @@ export namespace NativeMathf {
22062205
var sign_ = <i32>(hx >> 31);
22072206
hx &= 0x7FFFFFFF;
22082207
if (hx >= 0x42AEAC50) {
2208+
if (hx > 0x7F800000) return x; // NaN
22092209
if (hx >= 0x42B17218) {
22102210
if (!sign_) return x * Ox1p127f;
22112211
else if (hx >= 0x42CFF1B5) return 0;

0 commit comments

Comments
 (0)