You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/11/10 03:19:48 UTC
[incubator-nuttx-apps] branch master updated (ee4d8b738 -> 790391100)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
from ee4d8b738 Makefile: replace INCDIR to INCDIR_PREFIX
new f1e8e933c interpreter/toywasm: update toywasm version
new 790391100 toywasm_config.h: Add a license notice to appease nxstyle
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
interpreters/toywasm/Makefile | 18 ++++++------
.../toywasm/include/toywasm_config.h | 33 +++++++++++-----------
2 files changed, 24 insertions(+), 27 deletions(-)
copy system/uorb/sensor/ph.h => interpreters/toywasm/include/toywasm_config.h (62%)
[incubator-nuttx-apps] 01/02: interpreter/toywasm: update toywasm version
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit f1e8e933c5f114a87ef4a3cd08f77bb587dcbe36
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Nov 9 21:18:38 2022 +0900
interpreter/toywasm: update toywasm version
---
interpreters/toywasm/Makefile | 18 ++++++++----------
interpreters/toywasm/include/toywasm_config.h | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/interpreters/toywasm/Makefile b/interpreters/toywasm/Makefile
index 758bce9e2..d4852ae6b 100644
--- a/interpreters/toywasm/Makefile
+++ b/interpreters/toywasm/Makefile
@@ -25,8 +25,11 @@ PRIORITY = $(CONFIG_INTERPRETERS_TOYWASM_PRIORITY)
STACKSIZE = $(CONFIG_INTERPRETERS_TOYWASM_STACKSIZE)
MODULE = $(CONFIG_INTERPRETERS_TOYWASM)
+# cli
MAINSRC = main.c
+CSRCS += repl.c
+# lib
CSRCS += bitmap.c
CSRCS += cell.c
CSRCS += context.c
@@ -42,7 +45,6 @@ CSRCS += instance.c
CSRCS += leb128.c
CSRCS += module.c
CSRCS += module_writer.c
-CSRCS += repl.c
CSRCS += report.c
CSRCS += type.c
CSRCS += util.c
@@ -51,21 +53,17 @@ CSRCS += vec.c
CSRCS += wasi.c
CSRCS += xlog.c
-CFLAGS += -DTOYWASM_USE_SEPARATE_EXECUTE
-CFLAGS += -DTOYWASM_USE_TAILCALL
-CFLAGS += -DTOYWASM_USE_JUMP_BINARY_SEARCH
-CFLAGS += -DTOYWASM_JUMP_CACHE2_SIZE=4
-CFLAGS += -DTOYWASM_USE_SEPARATE_LOCALS
-CFLAGS += -DTOYWASM_USE_SMALL_CELLS
-CFLAGS += -DTOYWASM_ENABLE_WRITER
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/interpreters/toywasm/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/interpreters/toywasm/toywasm/lib}
-TOYWASM_VERSION = de70389cd98ad6e4ce9098197b86f249a56d7053
+TOYWASM_VERSION = 89465d57a8ad07a2e159711c92d3625bf66c41c7
TOYWASM_UNPACK = toywasm
TOYWASM_TARBALL = $(TOYWASM_VERSION).zip
TOYWASM_URL_BASE = https://github.com/yamt/toywasm/archive/
TOYWASM_URL = $(TOYWASM_URL_BASE)/$(TOYWASM_TARBALL)
-VPATH += $(TOYWASM_UNPACK)
+VPATH += $(TOYWASM_UNPACK)/cli
+VPATH += $(TOYWASM_UNPACK)/lib
$(TOYWASM_TARBALL):
$(Q) echo "Downloading $(TOYWASM_TARBALL)"
diff --git a/interpreters/toywasm/include/toywasm_config.h b/interpreters/toywasm/include/toywasm_config.h
new file mode 100644
index 000000000..6b553b518
--- /dev/null
+++ b/interpreters/toywasm/include/toywasm_config.h
@@ -0,0 +1,17 @@
+#if !defined(_TOYWASM_CONFIG_H)
+#define _TOYWASM_CONFIG_H
+
+#define TOYWASM_USE_SEPARATE_EXECUTE
+#define TOYWASM_USE_TAILCALL
+/* #undef TOYWASM_ENABLE_TRACING */
+#define TOYWASM_USE_JUMP_BINARY_SEARCH
+/* #undef TOYWASM_USE_JUMP_CACHE */
+#define TOYWASM_JUMP_CACHE2_SIZE 4
+#define TOYWASM_USE_LOCALS_CACHE
+#define TOYWASM_USE_SEPARATE_LOCALS
+#define TOYWASM_USE_SMALL_CELLS
+#define TOYWASM_USE_RESULTTYPE_CELLIDX
+#define TOYWASM_USE_LOCALTYPE_CELLIDX
+#define TOYWASM_ENABLE_WRITER
+
+#endif /* !defined(_TOYWASM_CONFIG_H) */
[incubator-nuttx-apps] 02/02: toywasm_config.h: Add a license notice to appease nxstyle
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 7903911000c1424f4795a1b352f25398565a3488
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Nov 9 21:27:53 2022 +0900
toywasm_config.h: Add a license notice to appease nxstyle
* This file is derived from [1], which is covered by [2].
* I'm the solo author of the file. I hereby re-license this version with
the license added by this commit.
[1] https://github.com/yamt/toywasm/blob/e43d33016ade69c3a3097c0160fc16bb4e11ed6d/lib/toywasm_config.h.in
[2] https://github.com/yamt/toywasm/blob/e43d33016ade69c3a3097c0160fc16bb4e11ed6d/LICENSE
---
interpreters/toywasm/include/toywasm_config.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/interpreters/toywasm/include/toywasm_config.h b/interpreters/toywasm/include/toywasm_config.h
index 6b553b518..fd018d13f 100644
--- a/interpreters/toywasm/include/toywasm_config.h
+++ b/interpreters/toywasm/include/toywasm_config.h
@@ -1,3 +1,23 @@
+/****************************************************************************
+ * apps/interpreters/toywasm/include/toywasm_config.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_CONFIG_H)
#define _TOYWASM_CONFIG_H