exception-handling

.github/workflows/ci.yml

@@ -32,6 +32,7 @@ jobs:
         MISC_FEATURES: [ON, OFF]
         TOYWASM_ENABLE_WASM_THREADS: [ON, OFF]
         TOYWASM_ENABLE_WASI_THREADS: [ON, OFF]
+        TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: [ON, OFF]
         exclude:
           # I haven't used gcc for macos
           - os: macos-latest
@@ -53,6 +54,10 @@ jobs:
             TOYWASM_ENABLE_WASM_THREADS: ON
           - TOYWASM_USE_SMALL_CELLS: OFF
             TOYWASM_ENABLE_WASM_THREADS: ON
+          # TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING right now
+          # requires TOYWASM_USE_SMALL_CELLS
+          - TOYWASM_USE_SMALL_CELLS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
           # exclude some more combinations to reduce the matrix
           - TOYWASM_USE_SMALL_CELLS: ON
             TOYWASM_USE_SEPARATE_LOCALS: ON
@@ -75,6 +80,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: ubuntu-20.04-amd64
             os: ubuntu-20.04
             compiler: clang
@@ -88,6 +94,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: full-ubuntu-20.04-amd64
             os: ubuntu-20.04
             compiler: clang
@@ -101,6 +108,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
           - name: macos-11.0
             os: macos-latest
             compiler: clang
@@ -114,6 +122,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: full-macos-11.0
             os: macos-latest
             compiler: clang
@@ -127,6 +136,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
 
           - name: ubuntu-20.04-i386
             os: ubuntu-20.04
@@ -141,6 +151,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: ubuntu-20.04-arm64
             os: ubuntu-20.04
             compiler: clang
@@ -154,6 +165,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: ubuntu-20.04-armhf
             os: ubuntu-20.04
             compiler: clang
@@ -167,6 +179,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: ubuntu-20.04-s390x
             os: ubuntu-20.04
             compiler: clang
@@ -180,6 +193,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
           - name: ubuntu-20.04-riscv64
             os: ubuntu-20.04
             compiler: clang
@@ -193,6 +207,7 @@ jobs:
             MISC_FEATURES: OFF
             TOYWASM_ENABLE_WASM_THREADS: OFF
             TOYWASM_ENABLE_WASI_THREADS: OFF
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF
 
           - name: full-ubuntu-20.04-i386
             os: ubuntu-20.04
@@ -207,6 +222,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
           - name: full-ubuntu-20.04-arm64
             os: ubuntu-20.04
             compiler: clang
@@ -220,6 +236,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
           - name: full-ubuntu-20.04-armhf
             os: ubuntu-20.04
             compiler: clang
@@ -233,6 +250,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
           - name: full-ubuntu-20.04-s390x
             os: ubuntu-20.04
             compiler: clang
@@ -246,6 +264,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
           - name: full-ubuntu-20.04-riscv64
             os: ubuntu-20.04
             compiler: clang
@@ -259,6 +278,7 @@ jobs:
             MISC_FEATURES: ON
             TOYWASM_ENABLE_WASM_THREADS: ON
             TOYWASM_ENABLE_WASI_THREADS: ON
+            TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON
 
     runs-on: ${{matrix.os}}
 
@@ -278,6 +298,7 @@ jobs:
         echo "-DTOYWASM_ENABLE_TRACING_INSN=${{matrix.TOYWASM_ENABLE_TRACING}}" >> ${GITHUB_ENV}
         echo "-DTOYWASM_USE_SMALL_CELLS=${{matrix.TOYWASM_USE_SMALL_CELLS}}" >> ${GITHUB_ENV}
         echo "-DTOYWASM_USE_SEPARATE_LOCALS=${{matrix.TOYWASM_USE_SEPARATE_LOCALS}}" >> ${GITHUB_ENV}
+        echo "-DTOYWASM_ENABLE_WASM_EXCEPTION_HANDLING=${{matrix.TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING}}"  >> ${GITHUB_ENV}
         echo "-DTOYWASM_ENABLE_WASM_EXTENDED_CONST=${{matrix.MISC_FEATURES}}" >> ${GITHUB_ENV}
         echo "-DTOYWASM_ENABLE_WASM_MULTI_MEMORY=${{matrix.MISC_FEATURES}}" >> ${GITHUB_ENV}
         echo "-DTOYWASM_ENABLE_WASM_TAILCALL=${{matrix.MISC_FEATURES}}" >> ${GITHUB_ENV}

CMakeLists.txt

@@ -137,6 +137,15 @@ set_tests_properties(toywasm-cli-wasm3-spec-test-threads PROPERTIES ENVIRONMENT
 set_tests_properties(toywasm-cli-wasm3-spec-test-threads PROPERTIES LABELS "spec:wasm-threads")
 endif()
 
+if(TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING)
+add_test(NAME toywasm-cli-exception-handling-test
+	COMMAND ./test.sh
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wat/eh
+)
+set_tests_properties(toywasm-cli-exception-handling-test PROPERTIES ENVIRONMENT "${TEST_ENV}")
+set_tests_properties(toywasm-cli-exception-handling-test PROPERTIES LABELS "exception-handling")
+endif()
+
 if(TOYWASM_ENABLE_WASI)
 add_test(NAME toywasm-cli-wasi-testsuite
 	COMMAND ./test/run-wasi-testsuite.sh

README.md

@@ -44,16 +44,17 @@ is built with an ancient wasi-sdk to workaround
 
 ## What are implemented?
 
-|Feature                 |Status                                            |
-| ---------------------- | ------------------------------------------------ |
-|[WebAssembly]           |Complete `2.0 (Draft 2022-06-27)`                 |
-|[extended-const]        |Complete (`TOYWASM_ENABLE_WASM_EXTENDED_CONST`)   |
-|[multi-memory]          |Complete (`TOYWASM_ENABLE_WASM_MULTI_MEMORY`)     |
-|[tail-call]             |Complete (`TOYWASM_ENABLE_WASM_TAILCALL`)         |
-|[threads]               |Complete (`TOYWASM_ENABLE_WASM_THREADS`)          |
-|[wasi_snapshot_preview1]|See [the top comment in wasi.c]                   |
-|[wasi-threads]          |Complete (`TOYWASM_ENABLE_WASI_THREADS`)          |
-|[dynamic-linking]       |Complete (`TOYWASM_ENABLE_DYLD`)                  |
+|Feature                 |Status                                              |
+| ---------------------- | -------------------------------------------------- |
+|[WebAssembly]           |Complete `2.0 (Draft 2022-06-27)`                   |
+|[extended-const]        |Complete (`TOYWASM_ENABLE_WASM_EXTENDED_CONST`)     |
+|[exception-handling]    |Complete (`TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING`) |
+|[multi-memory]          |Complete (`TOYWASM_ENABLE_WASM_MULTI_MEMORY`)       |
+|[tail-call]             |Complete (`TOYWASM_ENABLE_WASM_TAILCALL`)           |
+|[threads]               |Complete (`TOYWASM_ENABLE_WASM_THREADS`)            |
+|[wasi_snapshot_preview1]|See [the top comment in wasi.c]                     |
+|[wasi-threads]          |Complete (`TOYWASM_ENABLE_WASI_THREADS`)            |
+|[dynamic-linking]       |Complete (`TOYWASM_ENABLE_DYLD`)                    |
 
 Note: As this runtime is relatively new, all proposals which had finished
 when I started this implementation are just included in the `WebAssembly`
@@ -69,6 +70,7 @@ It includes
 
 [WebAssembly]: https://github.com/WebAssembly/spec
 [extended-const]: https://github.com/WebAssembly/extended-const
+[exception-handling]: https://github.com/WebAssembly/exception-handling
 [multi-memory]: https://github.com/WebAssembly/multi-memory
 [tail-call]: https://github.com/WebAssembly/tail-call
 [threads]: https://github.com/WebAssembly/threads

cmake/ToywasmConfig.cmake

@@ -126,6 +126,7 @@ option(TOYWASM_ENABLE_WRITER "Enable module writer" ON)
 option(TOYWASM_ENABLE_WASM_SIMD "Enable SIMD" ON)
 
 # enable each wasm proposals.
+option(TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING "Enable exception-handling proposal" OFF)
 option(TOYWASM_ENABLE_WASM_EXTENDED_CONST "Enable extended-const proposal" OFF)
 option(TOYWASM_ENABLE_WASM_MULTI_MEMORY "Enable multi-memory proposal" OFF)
 option(TOYWASM_ENABLE_WASM_TAILCALL "Enable WASM tail-call proposal" OFF)

lib/cell.c

@@ -27,9 +27,15 @@ valtype_cellsize(enum valtype t)
 #endif
         case TYPE_FUNCREF:
         case TYPE_EXTERNREF:
-                sz = sizeof(void *) / sizeof(struct cell);
+                sz = EXTERNREF_NCELLS;
                 assert(sizeof(void *) == sz * sizeof(struct cell));
                 break;
+#if defined(TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING)
+        case TYPE_EXNREF:
+                sz = EXNREF_NCELLS;
+                assert(sizeof(struct exception) <= sz * sizeof(struct cell));
+                break;
+#endif
         default:
                 xassert(false);
                 sz = 0;
@@ -225,15 +231,13 @@ void
 val_to_cells(const struct val *val, struct cell *cells, uint32_t ncells)
 {
         assert(ncells <= ARRAYCOUNT(val->u.cells));
-        assert(ncells == 1 || ncells == 2 || ncells == 4);
         cells_copy(cells, val->u.cells, ncells);
 }
 
 void
 val_from_cells(struct val *val, const struct cell *cells, uint32_t ncells)
 {
         assert(ncells <= ARRAYCOUNT(val->u.cells));
-        assert(ncells == 1 || ncells == 2 || ncells == 4);
         cells_copy(val->u.cells, cells, ncells);
 }
 

lib/context.h

@@ -17,11 +17,20 @@ enum ctrlframe_op {
 
         FRAME_OP_END = 0x0b,
 
+        FRAME_OP_TRY_TABLE = 0x1f,
+
         /* pseudo op */
         FRAME_OP_EMPTY_ELSE = 0xfe,
         FRAME_OP_INVOKE = 0xff,
 };
 
+enum try_handler_tag {
+        CATCH = 0x00,
+        CATCH_REF = 0x01,
+        CATCH_ALL = 0x02,
+        CATCH_ALL_REF = 0x03,
+};
+
 struct context {
         struct exec_context *exec;
         struct validation_context *validation;