Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wasm2c: uvwasi support #2002

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

wasm2c: uvwasi support #2002

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
facbe9a
Turn on uvwasi for compiled apps in build.
talg Sep 21, 2022
2109168
uvwasi runtime bindings.
talg Sep 21, 2022
716760c
Simple example that exercises uvwasi functionality.
talg Sep 21, 2022
f22d786
script to build aribitrary wasm file into stand-alone application.
talg Sep 21, 2022
a03de93
wasm2c: implement the bulk memory operations proposal (#1877)
keithw Sep 21, 2022
e9cd029
wasm2c cleanup: eliminate unused initialization functions in output (…
keithw Sep 21, 2022
9703be9
code and makefile cleanup of build-standalone example.
talg Sep 26, 2022
9e91a3a
Preprocessor mess removal.
talg Sep 26, 2022
5509923
replace wasm types with std c types
talg Sep 26, 2022
a24d4d1
Merge branch 'main' into uvwasi_support
talg Oct 7, 2022
fe560a2
use absolute paths as input to build.sh
talg Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ endif ()
option(BUILD_TESTS "Build GTest-based tests" ON)
option(USE_SYSTEM_GTEST "Use system GTest, instead of building" OFF)
option(BUILD_TOOLS "Build wabt commandline tools" ON)
option(BUILD_UVWASI "Build uvwasi for use by compiled applications" ON)
option(BUILD_FUZZ_TOOLS "Build tools that can repro fuzz bugs" OFF)
option(BUILD_LIBWASM "Build libwasm" ON)
option(USE_ASAN "Use address sanitizer" OFF)
Expand Down Expand Up @@ -353,6 +354,7 @@ set(WABT_LIBRARY_SRC
add_library(wabt STATIC ${WABT_LIBRARY_SRC})
add_library(wabt::wabt ALIAS wabt)


target_compile_features(wabt PUBLIC cxx_std_17)

if (WABT_INSTALL_RULES)
Expand Down Expand Up @@ -395,6 +397,10 @@ IF (NOT WIN32)
endif ()
endif ()

if (BUILD_UVWASI)
add_subdirectory("third_party/uvwasi" )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have a WITH_WASI flag .. is there some reason we can't use use that?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seemed to me like enabling the mostly not working wasi support in the interpreter, and allowing people to build their standalone apps with uvwasi were logically separate things. I'm not attached around the issue of wether this is enabled by default, so whatever makes sense just lmk.

endif ()

if (BUILD_FUZZ_TOOLS)
set(FUZZ_FLAGS "-fsanitize=fuzzer,address")
add_library(wabt-fuzz STATIC ${WABT_LIBRARY_SRC})
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Wabt has been compiled to JavaScript via emscripten. Some of the functionality i
| [threads][] | `--enable-threads` | | ✓ | ✓ | ✓ | ✓ | |
| [multi-value][] | `--disable-multi-value` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [tail-call][] | `--enable-tail-call` | | ✓ | ✓ | ✓ | ✓ | |
| [bulk memory][] | `--disable-bulk-memory` | ✓ | ✓ | ✓ | ✓ | ✓ | |
| [bulk memory][] | `--disable-bulk-memory` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [reference types][] | `--disable-reference-types` | ✓ | ✓ | ✓ | ✓ | ✓ | |
| [annotations][] | `--enable-annotations` | | | ✓ | | | |
| [memory64][] | `--enable-memory64` | | ✓ | ✓ | ✓ | ✓ | |
Expand Down
3 changes: 2 additions & 1 deletion scripts/gen-wasm2c-templates.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# https://stackoverflow.com/a/47801116
file(READ ${in} content)
set(content "const char* ${symbol} = R\"w2c_template(${content})w2c_template\";")
string(REGEX REPLACE "(.[^\n]*\n)" "R\"w2c_template(\\1)w2c_template\"\n" content "${content}")
set(content "const char* ${symbol} = ${content};")
file(WRITE ${out} "${content}")
Loading