From f841f0fe1fce74f34c1bc05b59d6416ddadc8cef Mon Sep 17 00:00:00 2001 From: Max Graey Date: Wed, 6 Mar 2019 21:20:18 +0200 Subject: [PATCH] Add portable sincos polyfill (#529) --- std/assembly/math.ts | 25 ++++++++++++++----------- std/portable/index.d.ts | 11 ++++++++++- std/portable/index.js | 27 ++++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/std/assembly/math.ts b/std/assembly/math.ts index b6a88f6f..f899f1b0 100644 --- a/std/assembly/math.ts +++ b/std/assembly/math.ts @@ -2329,18 +2329,21 @@ export namespace NativeMathf { } return tan_kernf(x, 0); } - if (ix <= 0x407b53d1) { /* |x| ~<= 5π/4 */ - if (ix <= 0x4016cbe3) { /* |x| ~<= 3π/4 */ - return tan_kernf((sign ? x + t1pio2 : x - t1pio2), 1); - } else { - return tan_kernf((sign ? x + t2pio2 : x - t2pio2), 0); + + if (ASC_SHRINK_LEVEL < 1) { + if (ix <= 0x407b53d1) { /* |x| ~<= 5π/4 */ + if (ix <= 0x4016cbe3) { /* |x| ~<= 3π/4 */ + return tan_kernf((sign ? x + t1pio2 : x - t1pio2), 1); + } else { + return tan_kernf((sign ? x + t2pio2 : x - t2pio2), 0); + } } - } - if (ix <= 0x40e231d5) { /* |x| ~<= 9π/4 */ - if (ix <= 0x40afeddf) { /* |x| ~<= 7π/4 */ - return tan_kernf((sign ? x + t3pio2 : x - t3pio2), 1); - } else { - return tan_kernf((sign ? x + t4pio2 : x - t4pio2), 0); + if (ix <= 0x40e231d5) { /* |x| ~<= 9π/4 */ + if (ix <= 0x40afeddf) { /* |x| ~<= 7π/4 */ + return tan_kernf((sign ? x + t3pio2 : x - t3pio2), 1); + } else { + return tan_kernf((sign ? x + t4pio2 : x - t4pio2), 0); + } } } diff --git a/std/portable/index.d.ts b/std/portable/index.d.ts index 26c7d0a1..1fbc7e41 100644 --- a/std/portable/index.d.ts +++ b/std/portable/index.d.ts @@ -100,13 +100,17 @@ declare function isFinite(value: T): bool; declare function isInteger(value: any): value is number; /** Tests if the specified value is a valid float. Can't distinguish a float from an integer. */ declare function isFloat(value: any): value is number; +/** Tests if the specified value is of a nullable reference type. */ +declare function isNullable(value: any): bool; /** Tests if the specified value is of a reference type. */ declare function isReference(value: any): value is object | string; +/** Tests if the specified value is of a function type */ +declare function isFunction(value: any): value is Function; /** Tests if the specified value can be used as a string. */ declare function isString(value: any): value is string | String; /** Tests if the specified value can be used as an array. */ declare function isArray(value: any): value is Array; -/** Tests if the specified type *or* expression can be used as an array like object. Compiles to a constant. */ +/** Tests if the specified type *or* expression can be used as an array like object. */ declare function isArrayLike(value: any): value is ArrayLike; /** Tests if the specified expression resolves to a defined element. */ declare function isDefined(expression: any): bool; @@ -567,6 +571,10 @@ interface IMath { readonly PI: f64; readonly SQRT1_2: f64; readonly SQRT2: f64; + + sincos_sin: f64; + sincos_cos: f64; + abs(x: f64): f64; acos(x: f64): f64; acosh(x: f64): f64; @@ -598,6 +606,7 @@ interface IMath { sign(x: f64): f64; signbit(x: f64): bool; sin(x: f64): f64; + sincos(x: f64): f64; sinh(x: f64): f64; sqrt(x: f64): f64; tan(x: f64): f64; diff --git a/std/portable/index.js b/std/portable/index.js index 7e7e2725..00aa35e1 100644 --- a/std/portable/index.js +++ b/std/portable/index.js @@ -206,10 +206,18 @@ globalScope["isFloat"] = function isFloat(arg) { return typeof arg === "number"; }; +globalScope["isNullable"] = function isNullable(arg) { + return true; +} + globalScope["isReference"] = function isReference(arg) { return typeof arg === "object" || typeof arg === "string"; }; +globalScope["isFunction"] = function isFunction(arg) { + return typeof arg === "function"; +} + globalScope["isString"] = function isString(arg) { return typeof arg === "string" || arg instanceof String; }; @@ -244,9 +252,22 @@ globalScope["fmodf"] = function fmodf(x, y) { }; globalScope["JSMath"] = Math; -globalScope["JSMath"].signbit = function signbit(x) { - F64[0] = x; return Boolean((U64[1] >>> 31) & (x == x)); -} + +Object.defineProperties(globalScope["JSMath"], { + sincos_sin: { value: 0.0, writable: true }, + sincos_cos: { value: 0.0, writable: true }, + signbit: { + value: function signbit(x) { + F64[0] = x; return Boolean((U64[1] >>> 31) & (x == x)); + } + }, + sincos: { + value: function sincos(x) { + this.sincos_sin = Math.sin(x); + this.sincos_cos = Math.cos(x); + } + } +}); globalScope["memory"] = (() => { var HEAP = new Uint8Array(0);