Enable AoT and wamr-sdk, and change arguments of call wasm API (#157)

* Implement memory profiler, optimize memory usage, modify code indent

* Implement memory.grow and limit heap space base offset to 1G; modify iwasm build type to Release and 64 bit by default

* Add a new extension library: connection

* Fix bug of reading magic number and version in big endian platform

* Re-org platform APIs: move most platform APIs from iwasm to shared-lib

* Enhance wasm loader to fix some security issues

* Fix issue about illegal load of EXC_RETURN into PC on stm32 board

* Updates that let a restricted version of the interpreter run in SGX

* Enable native/app address validation and conversion for wasm app

* Remove wasm_application_exectue_* APIs from wasm_export.h which makes confused

* Refine binary size and fix several minor issues

Optimize interpreter LOAD/STORE opcodes to decrease the binary size
Fix issues when using iwasm library: _bh_log undefined, bh_memory.h not found
Remove unused _stdin/_stdout/_stderr global variables resolve in libc wrapper
Add macros of global heap size, stack size, heap size for Zephyr main.c
Clear compile warning of wasm_application.c

* Add more strict security checks for libc wrapper API's

* Use one libc wrapper copy for sgx and other platforms; remove bh_printf macro for other platform header files

* Enhance security of libc strcpy/sprintf wrapper function

* Fix issue of call native for x86_64/arm/mips, add module inst parameter for native wrapper functions

* Remove get_module_inst() and fix issue of call native

* Refine wgl lib: remove module_inst parameter from widget functions; move function index check to runtime instantiate

* Refine interpreter call native process, refine memory boudary check

* Fix issues of invokeNative function of arm/mips/general version

* Add a switch to build simple sample without gui support

* Add BUILD_TARGET setting in makefile to replace cpu compiler flags in source code

* Re-org shared lib header files, remove unused info; fix compile issues of vxworks

* Add build target general

* Remove unused files

* Update license header

* test push

* Restore file

* Sync up with internal/feature

* Sync up with internal/feature

* Rename build_wamr_app to build_wasm_app

* Fix small issues of README

* Enhance malformed wasm file checking
Fix issue of print hex int and implement utf8 string check
Fix wasi file read/write right issue
Fix minor issue of build wasm app doc

* Sync up with internal/feature

* Sync up with internal/feature: fix interpreter arm issue, fix read leb issue

* Sync up with internal/feature

* Fix bug of config.h and rename wasi config.h to ssp_config.h

* Sync up with internal/feature

* Import wamr aot

* update document

* update document

* Update document, disable WASI in 32bit

* update document

* remove files

* update document

* Update document

* update document

* update document

* update samples

* Sync up with internal repo
This commit is contained in:
wenyongh
2020-01-21 13:26:14 +08:00
committed by Wang Xin
parent 2a4528c749
commit 46b93b9d22
464 changed files with 25137 additions and 7911 deletions

View File

@ -1,30 +1,27 @@
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
CC = clang-8
CC = /opt/wasi-sdk/bin/clang
APP_DIR = ${shell pwd}
IWASM_DIR=../../../../core/iwasm
IWASM_DIR = $(APP_DIR)/../../../../core/iwasm
SDK_DIR = $(APP_DIR)/../../../../wamr-sdk/out/gui/app-sdk
APP_FRAMEWORK_DIR = $(APP_DIR)/../../../../wamr-sdk/out/gui/app-sdk/wamr-app-framework
DEPS_DIR = $(APP_DIR)/../../../../core/deps
CFLAGS += -O3 \
-Wno-int-conversion \
-DLV_CONF_INCLUDE_SIMPLE \
-DENABLE_WGL=1 \
-I$(APP_DIR)/src/ \
-I$(IWASM_DIR)/lib/app-libs/base/ \
-I$(IWASM_DIR)/lib/native-interface/ \
-I$(IWASM_DIR)/lib/app-libs/extension/sensor \
-I$(IWASM_DIR)/lib/app-libs/extension/gui \
-I$(IWASM_DIR)/lib/app-libs/extension/connection
-Wno-int-conversion \
-I$(APP_DIR)/src \
-I$(APP_FRAMEWORK_DIR)/include \
-I${DEPS_DIR}
SRCS += $(APP_DIR)/src/main.c
# For app size consideration, not all but necessary app libs are included
SRCS += $(IWASM_DIR)/lib/app-libs/base/timer.c
SRCS += $(IWASM_DIR)/lib/app-libs/extension/gui/src/*.c
all:
all:
@$(CC) $(CFLAGS) $(SRCS) \
--target=wasm32 -O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
-Wl,--allow-undefined \
--sysroot=$(SDK_DIR)/libc-builtin-sysroot \
-L$(APP_FRAMEWORK_DIR)/lib -lapp_framework \
-Wl,--allow-undefined-file=$(SDK_DIR)/libc-builtin-sysroot/share/defined-symbols.txt \
-Wl,--no-threads,--strip-all,--no-entry -nostdlib \
-Wl,--export=on_init -Wl,--export=on_timer_callback \
-Wl,--export=on_widget_event \

View File

@ -4,9 +4,9 @@
*/
#include <stdlib.h>
#include <unistd.h>
#include "wasm_app.h"
#include "lvgl.h"
#include "wa-inc/lvgl.h"
#include "wa-inc/timer_wasm_app.h"
extern char g_widget_text[];

View File

@ -0,0 +1,20 @@
cmake_minimum_required(VERSION 2.8)
project(wgl)
set (WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../../)
include_directories(
${WAMR_ROOT_DIR}/wamr-sdk/out/gui/app-sdk/wamr-app-framework/include
${WAMR_ROOT_DIR}/core/deps
)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},-L${WAMR_ROOT_DIR}/wamr-sdk/out/gui/app-sdk/wamr-app-framework/lib")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},--export=on_init,--export=on_timer_callback,--export=on_widget_event")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-unused-command-line-argument")
add_executable(ui_app.wasm
${CMAKE_CURRENT_LIST_DIR}/src/main.c
)
target_link_libraries(ui_app.wasm app_framework)

View File

@ -1,27 +1,29 @@
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
CC = clang-8
CC = /opt/wasi-sdk/bin/clang
APP_DIR = ${shell pwd}
IWASM_DIR=../../../../core/iwasm
IWASM_DIR = ../../../../core/iwasm
APP_FRAMEWORK_DIR = ../../../../core/app-framework
DEPS_DIR = ../../../../core/deps
CFLAGS += -O3 \
-Wno-int-conversion \
-DLV_CONF_INCLUDE_SIMPLE \
-DENABLE_WGL=1 \
-I$(APP_DIR)/src/ \
-I$(IWASM_DIR)/lib/app-libs/base/ \
-I$(IWASM_DIR)/lib/native-interface/ \
-I$(IWASM_DIR)/lib/app-libs/extension/sensor \
-I$(IWASM_DIR)/lib/app-libs/extension/gui \
-I$(IWASM_DIR)/lib/app-libs/extension/connection
-I$(APP_DIR)/src \
-I$(APP_FRAMEWORK_DIR)/base/app \
-I$(APP_FRAMEWORK_DIR)/app-native-shared \
-I$(APP_FRAMEWORK_DIR)/sensor/app \
-I$(APP_FRAMEWORK_DIR)/wgl/app \
-I$(APP_FRAMEWORK_DIR)/connection/app \
-I${DEPS_DIR}
SRCS += $(APP_DIR)/src/main.c
# For app size consideration, not all but necessary app libs are included
SRCS += $(IWASM_DIR)/lib/app-libs/base/timer.c
SRCS += $(IWASM_DIR)/lib/app-libs/extension/gui/src/*.c
SRCS += $(APP_FRAMEWORK_DIR)/base/app/timer.c
SRCS += $(APP_FRAMEWORK_DIR)/wgl/app/src/*.c
all:
all:
@$(CC) $(CFLAGS) $(SRCS) \
--target=wasm32 -O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
-Wl,--allow-undefined \

View File

@ -4,8 +4,9 @@
*/
#include <stdlib.h>
#include <unistd.h>
#include "wasm_app.h"
#include "wa-inc/wgl.h"
#include "wa-inc/timer_wasm_app.h"
static void btn_event_cb(wgl_obj_t btn, wgl_event_t event);