From 1e5e755ba2a22684f456b38acbea6e9be9e94700 Mon Sep 17 00:00:00 2001 From: Huang Qi Date: Sun, 8 Oct 2023 11:35:55 +0800 Subject: [PATCH] examples: Split hello example into hello and hello_wasm Decouple the hello example into hello and hello_wasm. The hello_wasm example is a minimal example to show how to build a wasm application by using the NuttX build system, and avoid disturbing the hello (native build). Signed-off-by: Huang Qi --- examples/hello/Makefile | 8 ------ examples/hello_wasm/Kconfig | 29 ++++++++++++++++++++++ examples/hello_wasm/Make.defs | 23 +++++++++++++++++ examples/hello_wasm/Makefile | 42 ++++++++++++++++++++++++++++++++ examples/hello_wasm/hello_main.c | 40 ++++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 8 deletions(-) create mode 100644 examples/hello_wasm/Kconfig create mode 100644 examples/hello_wasm/Make.defs create mode 100644 examples/hello_wasm/Makefile create mode 100644 examples/hello_wasm/hello_main.c diff --git a/examples/hello/Makefile b/examples/hello/Makefile index 5d3eef130..f5f6017c0 100644 --- a/examples/hello/Makefile +++ b/examples/hello/Makefile @@ -31,12 +31,4 @@ MODULE = $(CONFIG_EXAMPLES_HELLO) MAINSRC = hello_main.c -# Build with WebAssembly when CONFIG_INTERPRETERS_WAMR is enabled - -WASM_BUILD = both - -# Mode of WebAssembly Micro Runtime - -WAMR_MODE = AOT - include $(APPDIR)/Application.mk diff --git a/examples/hello_wasm/Kconfig b/examples/hello_wasm/Kconfig new file mode 100644 index 000000000..fedb8d828 --- /dev/null +++ b/examples/hello_wasm/Kconfig @@ -0,0 +1,29 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +config EXAMPLES_HELLO_WASM + tristate "\"Hello, WebAssembly!\" example" + default n + ---help--- + Enable the \"Hello, WebAssembly!\" example + +if EXAMPLES_HELLO_WASM + +config EXAMPLES_HELLO_WASM_PROGNAME + string "Program name" + default "hello_wasm" + ---help--- + This is the name of the program that will be used when the NSH ELF + program is installed. + +config EXAMPLES_HELLO_WASM__PRIORITY + int "Hello wasm task priority" + default 100 + +config EXAMPLES_HELLO_WASM_STACKSIZE + int "Hello wasm stack size" + default DEFAULT_TASK_STACKSIZE + +endif diff --git a/examples/hello_wasm/Make.defs b/examples/hello_wasm/Make.defs new file mode 100644 index 000000000..26d76c292 --- /dev/null +++ b/examples/hello_wasm/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/examples/hello_wasm/Make.defs +# +# 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. +# +############################################################################ + +ifneq ($(CONFIG_EXAMPLES_HELLO_WASM),) +CONFIGURED_APPS += $(APPDIR)/examples/hello_wasm +endif diff --git a/examples/hello_wasm/Makefile b/examples/hello_wasm/Makefile new file mode 100644 index 000000000..1d6f4f81a --- /dev/null +++ b/examples/hello_wasm/Makefile @@ -0,0 +1,42 @@ +############################################################################ +# apps/examples/hello_wasm/Makefile +# +# 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. +# +############################################################################ + +include $(APPDIR)/Make.defs + +# Hello, World! built-in application info + +PROGNAME = $(CONFIG_EXAMPLES_HELLO_WASM_PROGNAME) +PRIORITY = $(CONFIG_EXAMPLES_HELLO_WASM_PRIORITY) +STACKSIZE = $(CONFIG_EXAMPLES_HELLO_WASM_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_HELLO_WASM) + +# Hello, World! Example + +MAINSRC = hello_main.c + +# Build with WebAssembly when CONFIG_INTERPRETERS_WAMR is enabled + +WASM_BUILD = y + +# Mode of WebAssembly Micro Runtime + +WAMR_MODE = AOT + +include $(APPDIR)/Application.mk diff --git a/examples/hello_wasm/hello_main.c b/examples/hello_wasm/hello_main.c new file mode 100644 index 000000000..a98dcf7e4 --- /dev/null +++ b/examples/hello_wasm/hello_main.c @@ -0,0 +1,40 @@ +/**************************************************************************** + * apps/examples/hello_wasm/hello_main.c + * + * 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * hello_main + ****************************************************************************/ + +int main(int argc, FAR char *argv[]) +{ + printf("Hello, WebAssembly!!\n"); + return 0; +}