wasm2c: uvwasi support

CMakeLists.txt

@@ -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)
@@ -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)
@@ -395,6 +397,10 @@ IF (NOT WIN32)
   endif ()
 endif ()
 
+if (BUILD_UVWASI)
+    add_subdirectory("third_party/uvwasi" )
+endif ()
+
 if (BUILD_FUZZ_TOOLS)
   set(FUZZ_FLAGS "-fsanitize=fuzzer,address")
   add_library(wabt-fuzz STATIC ${WABT_LIBRARY_SRC})

wasm2c/examples/build-standlone/Makefile

@@ -0,0 +1,27 @@
+WABT_ROOT=../../..
+WASM2C=$(WABT_ROOT)/bin/wasm2c
+
+WASM2C_RUNTIME_PATH=$(WABT_ROOT)/wasm2c/
+WASM2C_RUNTIME_FILES=$(addprefix $(WASM2C_RUNTIME_PATH), wasm-rt-impl.c uvwasi-rt.c)
+
+UVWASI_PATH=$(WABT_ROOT)/third_party/uvwasi
+
+DEPS=-I$(UVWASI_PATH)/include -L$(WABT_ROOT)/build/_deps/libuv-build -L$(WABT_ROOT)/build/third_party/uvwasi
+
+LIBS=-luvwasi_a -luv_a -lpthread -ldl -lm
+
+DBG_FLAGS=-g
+REL_FLAGS=-O3 -flto -fomit-frame-pointer -fno-stack-protector
+
+CFLAGS=$(REL_FLAGS)
+
+all: input.elf
+
+clean:
+	rm -rf $(ALL_RESULTS) input.*
+
+input.c:
+	$(WASM2C) input.wasm -o input.c
+
+input.elf: input.c  uvwasi-rt-main.c $(WASM2C_RUNTIME_FILES)
+	$(CC) $(CFLAGS) input.c uvwasi-rt-main.c -o input.elf -I$(WASM2C_RUNTIME_PATH) $(WASM2C_RUNTIME_FILES) $(DEPS) $(LIBS)

wasm2c/examples/build-standlone/build.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/bash
+if [ -z "$1" ]
+  then
+    echo "Compiles wasm file into standalone binary"
+    echo "usage: build.sh foo.wasm"
+    echo "outputs: foo.elf"
+    exit
+fi
+
+ORIGIN_DIR=$(pwd)
+SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+output_file=$(basename -- "$1")
+output_file="${output_file%%.*}.elf"
+
+set -v
+
+cd $SCRIPT_DIR
+make clean
+
+cp ${ORIGIN_DIR}/$1 ./input.wasm
+make input.c
+
+make input.elf
+cp -f input.elf ${ORIGIN_DIR}/${output_file}

wasm2c/examples/build-standlone/uvwasi-rt-main.c

@@ -0,0 +1,76 @@
+/* Link this with wasm2c output and uvwasi runtime to build a standalone app */
+#include <stdio.h>
+#include <stdlib.h>
+#include "uvwasi.h"
+#include "uvwasi-rt.h"
+
+#define MODULE_NAME input
+#define MODULE_HEADER "input.h"
+#include MODULE_HEADER
+
+//force pre-processor expansion of m_name
+#define __module_init(m_name) Z_## m_name ##_init_module()
+#define module_init(m_name) __module_init(m_name)
+
+#define __module_instantiate(m_name, instance_p, wasi_p) Z_## m_name ##_instantiate(instance_p, wasi_p)
+#define module_instantiate(m_name ,instance_p, wasi_p) __module_instantiate(m_name ,instance_p, wasi_p)
+
+#define __module_free(m_name, instance_p)  Z_## m_name ##_free(instance_p)
+#define module_free(m_name, instance_p) __module_free(m_name, instance_p)
+
+#define __module_start(m_name, instance_p) Z_ ## m_name ## Z__start(instance_p)
+#define module_start(m_name, instance_p) __module_start(m_name, instance_p)
+
+int main(int argc, const char** argv)
+{
+    Z_input_instance_t local_instance;
+    uvwasi_t local_uvwasi_state;
+
+    struct Z_wasi_snapshot_preview1_instance_t wasi_state = {
+	.uvwasi = &local_uvwasi_state,
+	.instance_memory = &local_instance.w2c_memory
+    };
+
+    uvwasi_options_t init_options;
+
+    //pass in standard descriptors
+    init_options.in = 0;
+    init_options.out = 1;
+    init_options.err = 2;
+    init_options.fd_table_size = 3;
+
+    //pass in args and environement
+    extern const char ** environ;
+    init_options.argc = argc;
+    init_options.argv = argv;
+    init_options.envp = (const char **) environ;
+
+    //no sandboxing enforced, binary has access to everything user does
+    init_options.preopenc = 2;
+    init_options.preopens = calloc(2, sizeof(uvwasi_preopen_t));
+
+    init_options.preopens[0].mapped_path = "/";
+    init_options.preopens[0].real_path = "/";
+    init_options.preopens[1].mapped_path = "./";
+    init_options.preopens[1].real_path = ".";
+
+    init_options.allocator = NULL;
+
+    wasm_rt_init();
+    uvwasi_errno_t ret = uvwasi_init(&local_uvwasi_state, &init_options);
+
+    if (ret != UVWASI_ESUCCESS) {
+        printf("uvwasi_init failed with error %d\n", ret);
+        exit(1);
+    }
+
+    module_init(MODULE_NAME);
+    module_instantiate(MODULE_NAME, &local_instance, (struct Z_wasi_snapshot_preview1_instance_t *) &wasi_state);
+    module_start(MODULE_NAME, &local_instance);
+    module_free(MODULE_NAME, &local_instance);
+
+    uvwasi_destroy(&local_uvwasi_state);
+    wasm_rt_free();
+
+    return 0;
+}

wasm2c/examples/hello-wasi/Makefile

@@ -0,0 +1,37 @@
+#assumes wasi-sdk installed system wide in default location
+WASI_SDK_ROOT=/opt/wasi-sdk
+WABT_ROOT=../../..
+
+WASI_CLANG=$(WASI_SDK_ROOT)/bin/clang
+WASI_SYSROOT=$(WASI_SDK_ROOT)/share/wasi-sysroot
+
+#CFLAGS for compiling files to place nice with wasm2c
+WASM_CFLAGS=-Wl,--export-all -Wl,--no-entry -Wl,--growable-table -Wl,--stack-first -Wl,-z,stack-size=1048576
+
+
+WASM2C=$(WABT_ROOT)/bin/wasm2c
+
+WASM2C_RUNTIME_PATH=$(WABT_ROOT)/wasm2c/
+WASM2C_RUNTIME_FILES=$(addprefix $(WASM2C_RUNTIME_PATH), wasm-rt-impl.c uvwasi-rt.c)
+
+UVWASI_PATH=$(WABT_ROOT)/third_party/uvwasi
+
+DEPS=-I$(UVWASI_PATH)/include -L$(WABT_ROOT)/build/_deps/libuv-build -L$(WABT_ROOT)/build/third_party/uvwasi
+
+LIBS=-luvwasi_a -luv_a -lpthread -ldl -lm
+
+ALL_RESULTS=hello.wasm hello.wasm.c hello.elf
+
+all: $(ALL_RESULTS)
+
+clean:
+	rm -rf $(ALL_RESULTS) hello.wasm.h *.o
+
+hello.wasm: hello.c
+	$(WASI_CLANG) --sysroot $(WASI_SYSROOT) $(WASM_CFLAGS) hello.c -o hello.wasm
+
+hello.wasm.c: hello.wasm
+	$(WASM2C) hello.wasm -o hello.wasm.c
+
+hello.elf: hello.wasm.c  uvwasi-rt-main.c $(WASM2C_RUNTIME_FILES)
+	$(CC) -g hello.wasm.c uvwasi-rt-main.c -o hello.elf -I$(WASM2C_RUNTIME_PATH) $(WASM2C_RUNTIME_FILES) $(DEPS) $(LIBS)

wasm2c/examples/hello-wasi/TODO

@@ -0,0 +1,2 @@
+-address any XXX or TODO lines
+-make sure linear memory accesses are bounded checked

wasm2c/examples/hello-wasi/hello.c

@@ -0,0 +1,34 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+int main(int argc, char * argv[]) {
+
+    printf("printing args\n");
+    for (int i = 0; i < argc ; i++) {
+	printf("[%d] %s \n", i, argv[i]);
+    }
+
+    printf("Writing to stdout\n");
+    char * hello_str = strdup("hello world!");
+    puts(hello_str);
+
+    printf("writing test.out\n");
+    FILE * fp = fopen("test.out", "w+");
+    assert(fp != NULL);
+    fprintf(fp,"hello filesystem\n");
+    fclose(fp);
+    printf("removing test.out\n");
+    assert(!unlink("test.out"));
+
+    printf("writing /tmp/test.out\n");
+    fp = fopen("/tmp/test.out", "w+");
+    assert(fp != NULL);
+    fprintf(fp,"hello filesystem\n");
+    fclose(fp);
+    printf("removing /tmp/test.out\n");
+    assert(!unlink("/tmp/test.out"));
+
+    return 0;
+}

wasm2c/examples/hello-wasi/uvwasi-rt-main.c

@@ -0,0 +1,76 @@
+/* Link this with wasm2c output and uvwasi runtime to build a standalone app */
+#include <stdio.h>
+#include <stdlib.h>
+#include "uvwasi.h"
+#include "uvwasi-rt.h"
+
+#define MODULE_NAME hello
+#define MODULE_HEADER "hello.wasm.h"
+#include MODULE_HEADER
+
+//force pre-processor expansion of m_name
+#define __module_init(m_name) Z_## m_name ##_init_module()
+#define module_init(m_name) __module_init(m_name)
+
+#define __module_instantiate(m_name, instance_p, wasi_p) Z_## m_name ##_instantiate(instance_p, wasi_p)
+#define module_instantiate(m_name ,instance_p, wasi_p) __module_instantiate(m_name ,instance_p, wasi_p)
+
+#define __module_free(m_name, instance_p)  Z_## m_name ##_free(instance_p)
+#define module_free(m_name, instance_p) __module_free(m_name, instance_p)
+
+#define __module_start(m_name, instance_p) Z_ ## m_name ## Z__start(instance_p)
+#define module_start(m_name, instance_p) __module_start(m_name, instance_p)
+
+int main(int argc, const char** argv)
+{
+    Z_hello_instance_t local_instance;
+    uvwasi_t local_uvwasi_state;
+
+    struct Z_wasi_snapshot_preview1_instance_t wasi_state = {
+	.uvwasi = &local_uvwasi_state,
+	.instance_memory = &local_instance.w2c_memory
+    };
+
+    uvwasi_options_t init_options;
+
+    //pass in standard descriptors
+    init_options.in = 0;
+    init_options.out = 1;
+    init_options.err = 2;
+    init_options.fd_table_size = 3;
+
+    //pass in args and environement
+    extern const char ** environ;
+    init_options.argc = argc;
+    init_options.argv = argv;
+    init_options.envp = (const char **) environ;
+
+    //no sandboxing enforced, binary has access to everything user does
+    init_options.preopenc = 2;
+    init_options.preopens = calloc(2, sizeof(uvwasi_preopen_t));
+
+    init_options.preopens[0].mapped_path = "/";
+    init_options.preopens[0].real_path = "/";
+    init_options.preopens[1].mapped_path = "./";
+    init_options.preopens[1].real_path = ".";
+
+    init_options.allocator = NULL;
+
+    wasm_rt_init();
+    uvwasi_errno_t ret = uvwasi_init(&local_uvwasi_state, &init_options);
+
+    if (ret != UVWASI_ESUCCESS) {
+        printf("uvwasi_init failed with error %d\n", ret);
+        exit(1);
+    }
+
+    module_init(MODULE_NAME);
+    module_instantiate(MODULE_NAME, &local_instance, (struct Z_wasi_snapshot_preview1_instance_t *) &wasi_state);
+    module_start(MODULE_NAME, &local_instance);
+    module_free(MODULE_NAME, &local_instance);
+
+    uvwasi_destroy(&local_uvwasi_state);
+    wasm_rt_free();
+
+    return 0;
+}