From c92f7eb9841eba3d13125efc1fa0bab40619fe1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 18 Nov 2024 10:06:27 +0100
Subject: [PATCH 1/2] Add Windows SDK CI
---
.github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b1854a3a..eccb5185b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -308,6 +308,36 @@ jobs:
build\run-test262.exe -c tests.conf
build\function_source.exe
+ windows-sdk:
+ runs-on: windows-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ arch: [x64, Win32]
+ buildType: [Debug, Release]
+ steps:
+ - uses: actions/checkout@v4
+ - name: Install windows sdk
+ uses: ChristopheLav/windows-sdk-install@v1
+ with:
+ version-sdk: 26100
+ features: 'OptionId.DesktopCPPx86,OptionId.DesktopCPPx64'
+ - name: build
+ run: |
+ cmake -B build -DBUILD_EXAMPLES=ON -DCMAKE_SYSTEM_VERSION="10.0.26100.0" -A ${{matrix.arch}}
+ cmake --build build --config ${{matrix.buildType}}
+ - name: stats
+ run: |
+ build\${{matrix.buildType}}\qjs.exe -qd
+ - name: test
+ run: |
+ cp build\${{matrix.buildType}}\fib.dll examples\
+ cp build\${{matrix.buildType}}\point.dll examples\
+ build\${{matrix.buildType}}\qjs.exe examples\test_fib.js
+ build\${{matrix.buildType}}\qjs.exe examples\test_point.js
+ build\${{matrix.buildType}}\run-test262.exe -c tests.conf
+ build\${{matrix.buildType}}\function_source.exe
+
windows-mingw:
runs-on: windows-latest
strategy:
From a3bc144c6ac1bbbfabb4a08ec03d4c7e8dd9b231 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 18 Nov 2024 10:07:39 +0100
Subject: [PATCH 2/2] Work around msvc definition of NAN
NAN is reportedly no longer a compile-time expression in some versions
of MSVC. Work around that by minting a NaN from a uint64.
Fixes: https://github.com/quickjs-ng/quickjs/issues/622
Fixes: https://github.com/quickjs-ng/quickjs/issues/693
---
quickjs.c | 4 ++--
quickjs.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/quickjs.c b/quickjs.c
index 675abb0b7..fc49fc8cc 100644
--- a/quickjs.c
+++ b/quickjs.c
@@ -41116,7 +41116,7 @@ static const JSCFunctionListEntry js_number_funcs[] = {
JS_CFUNC_DEF("isSafeInteger", 1, js_number_isSafeInteger ),
JS_PROP_DOUBLE_DEF("MAX_VALUE", 1.7976931348623157e+308, 0 ),
JS_PROP_DOUBLE_DEF("MIN_VALUE", 5e-324, 0 ),
- JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
+ JS_PROP_U2D_DEF("NaN", 0x7FF8ull<<48, 0 ), // workaround for msvc
JS_PROP_DOUBLE_DEF("NEGATIVE_INFINITY", -INFINITY, 0 ),
JS_PROP_DOUBLE_DEF("POSITIVE_INFINITY", INFINITY, 0 ),
JS_PROP_DOUBLE_DEF("EPSILON", 2.220446049250313e-16, 0 ), /* ES6 */
@@ -50197,7 +50197,7 @@ static const JSCFunctionListEntry js_global_funcs[] = {
JS_CFUNC_DEF("escape", 1, js_global_escape ),
JS_CFUNC_DEF("unescape", 1, js_global_unescape ),
JS_PROP_DOUBLE_DEF("Infinity", 1.0 / 0.0, 0 ),
- JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
+ JS_PROP_U2D_DEF("NaN", 0x7FF8ull<<48, 0 ), // workaround for msvc
JS_PROP_UNDEFINED_DEF("undefined", 0 ),
JS_PROP_STRING_DEF("[Symbol.toStringTag]", "global", JS_PROP_CONFIGURABLE ),
};
diff --git a/quickjs.h b/quickjs.h
index 6f0fe4590..709da6b18 100644
--- a/quickjs.h
+++ b/quickjs.h
@@ -970,6 +970,7 @@ typedef struct JSCFunctionListEntry {
const char *str; /* pure ASCII or UTF-8 encoded */
int32_t i32;
int64_t i64;
+ uint64_t u64;
double f64;
} u;
} JSCFunctionListEntry;
@@ -998,6 +999,7 @@ typedef struct JSCFunctionListEntry {
#define JS_PROP_INT32_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_INT32, 0, { .i32 = val } }
#define JS_PROP_INT64_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_INT64, 0, { .i64 = val } }
#define JS_PROP_DOUBLE_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_DOUBLE, 0, { .f64 = val } }
+#define JS_PROP_U2D_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_DOUBLE, 0, { .u64 = val } }
#define JS_PROP_UNDEFINED_DEF(name, prop_flags) { name, prop_flags, JS_DEF_PROP_UNDEFINED, 0, { .i32 = 0 } }
#define JS_OBJECT_DEF(name, tab, len, prop_flags) { name, prop_flags, JS_DEF_OBJECT, 0, { .prop_list = { tab, len } } }
#define JS_ALIAS_DEF(name, from) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_ALIAS, 0, { .alias = { from, -1 } } }