interpreter/toywasm: Update toywasm version

Tested on esp32-devkitc.

interpreters/toywasm/Makefile

@@ -28,7 +28,6 @@ MODULE    = $(CONFIG_INTERPRETERS_TOYWASM)
 # cli
 MAINSRC = main.c
 CSRCS += repl.c
-CSRCS += toywasm_config.c
 
 # lib
 CSRCS += bitmap.c
@@ -49,27 +48,35 @@ CSRCS += list.c
 CSRCS += module.c
 CSRCS += module_writer.c
 CSRCS += nbio.c
+CSRCS += options.c
 CSRCS += report.c
+CSRCS += shared_memory.c
 CSRCS += timeutil.c
+CSRCS += toywasm_config.c
 CSRCS += type.c
 CSRCS += util.c
 CSRCS += validation.c
 CSRCS += vec.c
-CSRCS += wasi.c
 CSRCS += xlog.c
 
 # TOYWASM_ENABLE_WASM_THREADS
+CSRCS += cluster.c
 CSRCS += lock.c
 CSRCS += waitlist.c
+#CSRCS += usched.c
+
+# libwasi
+CSRCS += wasi.c
+CSRCS += wasi_fdtable.c
 
 # TOYWASM_ENABLE_WASI_THREADS
-CSRCS += shared_memory.c
 CSRCS += wasi_threads.c
 
 CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/interpreters/toywasm/include}
 CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/interpreters/toywasm/toywasm/lib}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/interpreters/toywasm/toywasm/libwasi}
 
-TOYWASM_VERSION  = 5a1d6bf349571e0b63a9d02d73e01b8e212fb8c0
+TOYWASM_VERSION  = 7c6ff3925d0b0f4d5122df9b1b5761bc2954e014
 TOYWASM_UNPACK   = toywasm
 TOYWASM_TARBALL  = $(TOYWASM_VERSION).zip
 TOYWASM_URL_BASE = https://github.com/yamt/toywasm/archive/
@@ -77,6 +84,7 @@ TOYWASM_URL      = $(TOYWASM_URL_BASE)/$(TOYWASM_TARBALL)
 
 VPATH += $(TOYWASM_UNPACK)/cli
 VPATH += $(TOYWASM_UNPACK)/lib
+VPATH += $(TOYWASM_UNPACK)/libwasi
 VPATH += src
 
 $(TOYWASM_TARBALL):

interpreters/toywasm/include/toywasm_config.h

@@ -23,7 +23,13 @@
 
 #define TOYWASM_USE_SEPARATE_EXECUTE
 #define TOYWASM_USE_TAILCALL
+/* #undef TOYWASM_USE_SHORT_ENUMS */
+
+/* #undef TOYWASM_USE_USER_SCHED */
+
 /* #undef TOYWASM_ENABLE_TRACING */
+
+/* #undef TOYWASM_ENABLE_TRACING_INSN */
 #define TOYWASM_USE_JUMP_BINARY_SEARCH
 /* #undef TOYWASM_USE_JUMP_CACHE */
 #define TOYWASM_JUMP_CACHE2_SIZE 4
@@ -33,7 +39,11 @@
 #define TOYWASM_USE_RESULTTYPE_CELLIDX
 #define TOYWASM_USE_LOCALTYPE_CELLIDX
 #define TOYWASM_ENABLE_WRITER
+#define TOYWASM_ENABLE_WASM_EXTENDED_CONST
+#define TOYWASM_ENABLE_WASM_MULTI_MEMORY
+#define TOYWASM_ENABLE_WASM_TAILCALL
 #define TOYWASM_ENABLE_WASM_THREADS
+#define TOYWASM_ENABLE_WASI
 #define TOYWASM_ENABLE_WASI_THREADS
 
 #endif /* !defined(_TOYWASM_CONFIG_H) */

interpreters/toywasm/include/toywasm_version.h

@@ -0,0 +1,26 @@
+/****************************************************************************
+ * apps/interpreters/toywasm/include/toywasm_version.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#if !defined(_TOYWASM_VERSION_H)
+#define _TOYWASM_VERSION_H
+
+#define TOYWASM_VERSION "v0.0.17-1-g7c6ff39"
+
+#endif /* !defined(_TOYWASM_VERSION_H) */

interpreters/toywasm/src/toywasm_config.c

@@ -29,7 +29,10 @@
 const char *toywasm_config_string =
 "\tTOYWASM_USE_SEPARATE_EXECUTE = ON\n"
 "\tTOYWASM_USE_TAILCALL = ON\n"
+"\tTOYWASM_USE_SHORT_ENUMS = OFF\n"
+"\tTOYWASM_USE_USER_SCHED = OFF\n"
 "\tTOYWASM_ENABLE_TRACING = OFF\n"
+"\tTOYWASM_ENABLE_TRACING_INSN = OFF\n"
 "\tTOYWASM_USE_JUMP_BINARY_SEARCH = ON\n"
 "\tTOYWASM_USE_JUMP_CACHE = OFF\n"
 "\tTOYWASM_JUMP_CACHE2_SIZE = 4\n"
@@ -39,5 +42,9 @@ const char *toywasm_config_string =
 "\tTOYWASM_USE_RESULTTYPE_CELLIDX = ON\n"
 "\tTOYWASM_USE_LOCALTYPE_CELLIDX = ON\n"
 "\tTOYWASM_ENABLE_WRITER = ON\n"
+"\tTOYWASM_ENABLE_WASM_EXTENDED_CONST = ON\n"
+"\tTOYWASM_ENABLE_WASM_MULTI_MEMORY = ON\n"
+"\tTOYWASM_ENABLE_WASM_TAILCALL = ON\n"
 "\tTOYWASM_ENABLE_WASM_THREADS = ON\n"
+"\tTOYWASM_ENABLE_WASI = ON\n"
 "\tTOYWASM_ENABLE_WASI_THREADS = ON\n";