Windows support #843

axic · 2023-01-05T23:30:30Z

Closes #544.

axic · 2023-01-05T23:31:15Z

cmake/Hunter/init.cmake

@@ -25,7 +25,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()

 HunterGate(
-    URL https://github.com/cpp-pm/hunter/archive/v0.23.294.tar.gz
-    SHA1 0dd1ee8723d54a15822519c17a877c1f281fce39
+    URL https://github.com/cpp-pm/hunter/archive/v0.24.13.tar.gz


Need to update to 0.23.371 at least in order to support MSVC 2022.

axic · 2023-01-05T23:31:27Z

cmake/Hunter/config.cmake

-    HUNTER_INSTALL_LICENSE_FILES=LICENSE
-    gtest_force_shared_crt=TRUE
-)
+#hunter_config(


The newer Hunter contains this.

axic · 2023-01-05T23:31:41Z

lib/fizzy/execute.cpp

@@ -31,22 +31,22 @@ template <typename T>
 inline T read(const uint8_t*& input) noexcept
 {
    T ret;
-    __builtin_memcpy(&ret, input, sizeof(ret));
+    memcpy(&ret, input, sizeof(ret));


To be fixed.

axic · 2023-01-05T23:31:51Z

lib/fizzy/parser.cpp

@@ -455,8 +456,8 @@ inline parser_result<Data> parse(const uint8_t* pos, const uint8_t* end)

 std::unique_ptr<const Module> parse(bytes_view input)
 {
-    if (input.substr(0, wasm_prefix.size()) != wasm_prefix)
-        throw parser_error{"invalid wasm module prefix"};
+//    if (input.substr(0, wasm_prefix.size()) != wasm_prefix)


To be fixed.

axic · 2023-01-05T23:32:38Z

cmake/ProjectUVWASI.cmake

@@ -12,6 +12,14 @@ set(include_dir ${source_dir}/include)
 set(uvwasi_library ${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}uvwasi_a${CMAKE_STATIC_LIBRARY_SUFFIX})
 set(uv_library ${binary_dir}/_deps/libuv-build/${CMAKE_STATIC_LIBRARY_PREFIX}uv_a${CMAKE_STATIC_LIBRARY_SUFFIX})

+# This is hack. Should fix proper uvwasi.cmake integration.


Theses are imported in https://github.com/nodejs/uvwasi/blob/master/cmake/FindLibUV.cmake, but we do a botched job at cmake-integrating uvwasi.

axic · 2023-01-05T23:33:14Z

lib/fizzy/capi.cpp

@@ -8,6 +8,8 @@
 #include "instantiate.hpp"
 #include "parser.hpp"
 #include <fizzy/fizzy.h>
+#include <algorithm>
+#include <iterator>


For back_inserter and some other case I forgot.

sonatype-lift · 2023-01-05T23:33:32Z

lib/fizzy/parser_expr.cpp

@@ -16,7 +16,7 @@ namespace
 template <typename T>
 inline void store(uint8_t* dst, T value) noexcept
 {
-    __builtin_memcpy(dst, &value, sizeof(value));
+    memcpy(dst, &value, sizeof(value));


CWE 805 advisory: suspicious sizeof in strncpy, strncat or memcpy

ℹ️ Learn about @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

axic · 2023-01-05T23:34:57Z

test/utils/wabt_engine.cpp

@@ -16,7 +16,7 @@ namespace fizzy::test
 class WabtEngine final : public WasmEngine
 {
    // mutable because getting RefPtr from Ref requires non-const Store
-    mutable wabt::interp::Store m_store{([]() constexpr noexcept {
+    mutable wabt::interp::Store m_store{([]() noexcept {
        wabt::Features features;
        features.disable_multi_value();


These are not constexpr: https://github.com/WebAssembly/wabt/blob/1.0.19/src/feature.h#L39

Found by MSVC:

[48/103] Building CXX object test\utils\CMakeFiles\test-utils.dir\wabt_engine.cpp.obj FAILED: test/utils/CMakeFiles/test-utils.dir/wabt_engine.cpp.obj C:\PROGRA~1\MICROS~4\2022\COMMUN~1\VC\Tools\MSVC\1433~1.316\bin\Hostx64\x64\cl.exe /nologo /TP -IC:\Users\circleci.PACKER-633B1A5A\project -IC:\Users\circleci.PACKER-633B1A5A\project\lib\fizzy -IC:\Users\circleci.PACKER-633B1A5A\project\include -external:IC:\Users\circleci.PACKER-633B1A5A\build\_deps\src\wabt -external:IC:\Users\circleci.PACKER-633B1A5A\build\_deps\src\wabt-build -external:IC:\Users\circleci.PACKER-633B1A5A\build\_deps\src\wasm3 -external:IC:\Users\circleci.PACKER-633B1A5A\.hunter\_Base\2bc7384\4753fe5\c0cf92b\Install\include -external:W0 /DWIN32 /D_WINDOWS /GR /EHsc /O2 /Ob2 /DNDEBUG -MD /W4 /WX /wd4068 -std:c++20 /showIncludes /Fotest\utils\CMakeFiles\test-utils.dir\wabt_engine.cpp.obj /Fdtest\utils\CMakeFiles\test-utils.dir\test-utils.pdb /FS -c C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(19): error C3615: constexpr function 'fizzy::test::WabtEngine::<lambda_1>::operator ()' cannot result in a constant expression C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(21): note: failure was caused by call of undefined function or one not declared 'constexpr' C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(21): note: see usage of 'wabt::Features::disable_multi_value' C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(22): note: failure was caused by call of undefined function or one not declared 'constexpr' C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(22): note: see usage of 'wabt::Features::disable_sat_float_to_int' C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(23): note: failure was caused by call of undefined function or one not declared 'constexpr' C:\Users\circleci.PACKER-633B1A5A\project\test\utils\wabt_engine.cpp(23): note: see usage of 'wabt::Features::disable_sign_extension' [49/103] Building CXX object test\utils\CMakeFiles\test-utils.dir\asserts.cpp.obj ``

axic · 2023-01-06T00:02:29Z

Last piece waiting is fixing the patch system for wasm3 or fixing+merging #739.

axic · 2023-01-06T00:05:38Z

circle.yml

+            $ErrorActionPreference = "Stop"
+            & 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch amd64
+            which cmake
+            cmake -S . -B ~/build -G Ninja -DCMAKE_INSTALL_PREFIX=C:\install -DCMAKE_CXX_STANDARD=20 -DFIZZY_TESTING=ON


C++20 is forced here.

axic commented Jan 5, 2023

View reviewed changes

sonatype-lift bot reviewed Jan 5, 2023

View reviewed changes

axic commented Jan 5, 2023

View reviewed changes

axic commented Jan 6, 2023

View reviewed changes

axic added 18 commits March 3, 2023 19:06

ci: Add release-windows build

749ea81

move for win

a58cb96

f

5d43917

Disable sanitizer on windows

92ba7d1

require c++20 for windows

c00a2f2

Add missing include for iterator

a256b9e

fix ifndef

4c19ac8

quick hack for msvc

7e13ff4

hack for windows

c386369

add dumb basic_string_view

f79ddb3

turn on test build

5fb7c2b

cmake: Update Hunter

32cab31

hunter

36a02c8

hunter (needed for msvc2022 support)

edd4d7c

hunter update (gtest already present)

dd390d7

cmake: Link ws2_#2 on windows for uvwasi

a112375

missing header

ca348be

This is not noexcept in wabt

5df6ae7

axic force-pushed the ci-windows branch from 8a25d29 to 5df6ae7 Compare March 3, 2023 18:07

axic added 4 commits March 3, 2023 19:10

bytes_string clang-format

6de90b5

clang-format

e380b3f

header include for memcpy

0629be8

linter

ceb39b6

axic force-pushed the ci-windows branch from 7fc95c9 to ceb39b6 Compare March 19, 2023 11:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Windows support #843

Windows support #843

axic commented Jan 5, 2023 •

edited

Loading

axic Jan 5, 2023

axic Jan 5, 2023

axic Jan 5, 2023

axic Jan 5, 2023

axic Jan 5, 2023

axic Jan 5, 2023

sonatype-lift bot Jan 5, 2023

axic Jan 5, 2023 •

edited

Loading

axic Mar 3, 2023

axic commented Jan 6, 2023

axic Jan 6, 2023

Command	Usage
`@sonatype-lift ignore`	Leave out the above finding from this PR
`@sonatype-lift ignoreall`	Leave out all the existing findings from this PR
`@sonatype-lift exclude <file\|issue\|path\|tool>`	Exclude specified `file\|issue\|path\|tool` from Lift findings by updating your config.toml file

Windows support #843

Are you sure you want to change the base?

Windows support #843

Conversation

axic commented Jan 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonatype-lift bot Jan 5, 2023

Choose a reason for hiding this comment

axic Jan 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

axic commented Jan 6, 2023

Choose a reason for hiding this comment

axic commented Jan 5, 2023 •

edited

Loading

axic Jan 5, 2023 •

edited

Loading