[0084] 修复 goldfish 的 WASM 构建支持 (#882)

Author: JimZhouZZY

devel/0084.md

@@ -0,0 +1,31 @@
+# [0084] 修复 goldfish 的 WASM 构建支持
+## What
+1. 给 `liii_subprocess.cpp` 中的 `wordexp` 相关调用添加缺失的条件编译宏
+2. 删去 `s7_internal_helpers.h` 中的静态函数定义，在 WASM 编译条件下将导致重复定义
+3. 给 `s7_scheme_inexact.c` 中的 `int_to_int` 静态函数添加缺失的条件编译宏
+4. 修改 emscripten 版本为 3.1.56 (原来的 3.1.55 下载源关闭了，无法拉取)
+5. 修改 cpr, libcurl, json_schema_validator 的 `xmake.lua`，允许 wasm 平台编译
+
+## 如何测试
+1. 
+```
+xmake f -p wasm
+```
+2. 
+```
+xmake b goldfish
+```
+3. 
+```
+xmake r goldfish
+```
+4. 
+浏览器中应该显示出 goldfish 的帮助输出
+
+console 中输入 
+
+```javascript
+callMain(["-e", "(+ 1 2)"])
+```
+
+应当有输出 ‘3’

src/liii_subprocess.cpp

@@ -255,13 +255,15 @@ f_subprocess_run_values (s7_scheme* sc, s7_pointer args) {
     const char* cmd_c= s7_string (cmd_arg);
 #ifdef TB_CONFIG_OS_WINDOWS
     process= tb_process_init_cmd (cmd_c, &attr);
-#else
+#elif !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__EMSCRIPTEN__)
     wordexp_t p;
     int       ret= wordexp (cmd_c, &p, 0);
     if (ret == 0 && p.we_wordc > 0) {
       process= tb_process_init (p.we_wordv[0], (tb_char_t const**) p.we_wordv, &attr);
       wordfree (&p);
     }
+#else
+    process= tb_process_init_cmd (cmd_c, &attr);
 #endif
   }
   else if (s7_is_pair (cmd_arg)) {

src/s7_internal_helpers.h

@@ -28,11 +28,7 @@
     #define multiply_overflow(A, B, C) __builtin_mul_overflow(A, B, C)
   #elif defined(__GNUC__) && (__GNUC__ >= 5)
     #define multiply_overflow(A, B, C) __builtin_mul_overflow(A, B, C)
-  #else
-    static bool multiply_overflow(s7_int A, s7_int B, s7_int *C) {*C = A * B; return(false);}
   #endif
-#else
-  static bool multiply_overflow(s7_int A, s7_int B, s7_int *C) {*C = A * B; return(false);}
 #endif
 
 /* forward declarations for internal types used in bridge functions */

src/s7_scheme_inexact.c

@@ -1141,8 +1141,12 @@ static s7_int int_to_int(s7_int x, s7_int n)
   do {
     if (n & 1) value *= x;
     n >>= 1;
+#if HAVE_OVERFLOW_CHECKS
     if (multiply_overflow(x, x, &x))
       break;
+#else
+    x *= x;
+#endif
   } while (n);
   return(value);
 }

xmake.lua

@@ -64,7 +64,7 @@ end
 
 if is_plat("wasm") then
 if has_config("pin-deps") then
-    add_requires("emscripten 3.1.55")
+    add_requires("emscripten 3.1.56")
 else
     add_requires("emscripten")
 end

xmake/packages/c/cpr/xmake.lua

@@ -23,7 +23,7 @@ package("cpr")
         end
     end)
 
-    on_install("linux", "macosx", "windows", "mingw@windows", function (package)
+    on_install("linux", "macosx", "windows", "mingw@windows", "wasm", function (package)
         local configs = {"-DCPR_BUILD_TESTS=OFF",
                          "-DCPR_FORCE_USE_SYSTEM_CURL=ON",
                          "-DCPR_USE_SYSTEM_CURL=ON"}

xmake/packages/j/json_schema_validator/xmake.lua

@@ -8,7 +8,7 @@ package("json_schema_validator")
     add_deps("cmake", "nlohmann_json")
     add_links("nlohmann_json_schema_validator")
 
-    on_install("linux", "macosx", "windows", "mingw@windows", function (package)
+    on_install("linux", "macosx", "windows", "mingw@windows", "wasm", function (package)
         local nlohmann_json = package:dep("nlohmann_json")
         local nlohmann_json_cmake_dir = path.join(nlohmann_json:installdir("lib"), "cmake", "nlohmann_json")
         local configs = {

xmake/packages/l/libcurl/xmake.lua

@@ -84,7 +84,7 @@ package("libcurl")
         end
     end)
 
-    on_install("windows", "mingw", "linux", "macosx", "iphoneos", "cross", "android", function (package)
+    on_install("windows", "mingw", "linux", "macosx", "iphoneos", "cross", "android", "wasm", function (package)
         local version = package:version()
 
         local configs = {"-DBUILD_TESTING=OFF", "-DENABLE_MANUAL=OFF", "-DENABLE_CURL_MANUAL=OFF"}