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
@ -8,7 +8,7 @@
|
||||
#include "bh_queue.h"
|
||||
#include "bh_memory.h"
|
||||
#include "bh_thread.h"
|
||||
#include "attr_container.h"
|
||||
#include "bi-inc/attr_container.h"
|
||||
#include "event.h"
|
||||
#include "watchdog.h"
|
||||
#include "coap_ext.h"
|
||||
@ -214,7 +214,7 @@ void applet_mgt_reqeust_handler(request_t *request, void *unused)
|
||||
static int get_module_type(char *kv_str)
|
||||
{
|
||||
int module_type = -1;
|
||||
char type_str[8] = { 0 };
|
||||
char type_str[16] = { 0 };
|
||||
|
||||
find_key_value(kv_str, strlen(kv_str), "type", type_str,
|
||||
sizeof(type_str) - 1, '&');
|
||||
|
||||
@ -12,17 +12,14 @@
|
||||
#include "bh_types.h"
|
||||
#include "app_manager_export.h"
|
||||
#include "native_interface.h"
|
||||
#include "shared_utils.h"
|
||||
#include "bi-inc/shared_utils.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef __ZEPHYR__
|
||||
#define app_manager_printf printf
|
||||
#else
|
||||
#define app_manager_printf printk
|
||||
#endif
|
||||
/* bh_printf is defined in each platform */
|
||||
#define app_manager_printf bh_printf
|
||||
|
||||
#define SEND_ERR_RESPONSE(mid, err_msg) do { \
|
||||
app_manager_printf("%s\n", err_msg); \
|
||||
@ -79,11 +76,6 @@ app_manager_signature_verify(const uint8_t *file, unsigned int file_len,
|
||||
|
||||
void targeted_app_request_handler(request_t *request, void *unused);
|
||||
|
||||
#if BEIHAI_ENABLE_TOOL_AGENT != 0
|
||||
void *
|
||||
app_manager_get_tool_agent_queue();
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* end of extern "C" */
|
||||
#endif
|
||||
|
||||
@ -110,12 +110,7 @@ static int on_imrt_link_byte_arrive(unsigned char ch, recv_context_t *ctx)
|
||||
p[ctx->size_in_phase++] = ch;
|
||||
|
||||
if (ctx->size_in_phase == sizeof(ctx->message.payload_size)) {
|
||||
#ifndef __ZEPHYR__
|
||||
ctx->message.payload_size = ntohl(ctx->message.payload_size);
|
||||
#else
|
||||
if (is_little_endian())
|
||||
exchange32((uint8*)&ctx->message.payload_size);
|
||||
#endif
|
||||
ctx->phase = Phase_Payload;
|
||||
|
||||
if (enable_log)
|
||||
@ -140,9 +135,9 @@ static int on_imrt_link_byte_arrive(unsigned char ch, recv_context_t *ctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ctx->message.message_type != INSTALL_WASM_BYTECODE_APP) {
|
||||
ctx->message.payload = (char *) bh_malloc(
|
||||
ctx->message.payload_size);
|
||||
if (ctx->message.message_type != INSTALL_WASM_APP) {
|
||||
ctx->message.payload =
|
||||
(char *) bh_malloc(ctx->message.payload_size);
|
||||
if (!ctx->message.payload) {
|
||||
ctx->phase = Phase_Non_Start;
|
||||
return 0;
|
||||
@ -155,7 +150,7 @@ static int on_imrt_link_byte_arrive(unsigned char ch, recv_context_t *ctx)
|
||||
|
||||
return 0;
|
||||
} else if (ctx->phase == Phase_Payload) {
|
||||
if (ctx->message.message_type == INSTALL_WASM_BYTECODE_APP) {
|
||||
if (ctx->message.message_type == INSTALL_WASM_APP) {
|
||||
int received_size;
|
||||
module_on_install_request_byte_arrive_func module_on_install =
|
||||
g_module_interfaces[Module_WASM_App]->module_on_install;
|
||||
@ -164,7 +159,7 @@ static int on_imrt_link_byte_arrive(unsigned char ch, recv_context_t *ctx)
|
||||
|
||||
if (module_on_install != NULL) {
|
||||
if (module_on_install(ch, ctx->message.payload_size,
|
||||
&received_size)) {
|
||||
&received_size)) {
|
||||
if (received_size == ctx->message.payload_size) {
|
||||
/* whole wasm app received */
|
||||
ctx->phase = Phase_Non_Start;
|
||||
@ -173,11 +168,13 @@ static int on_imrt_link_byte_arrive(unsigned char ch, recv_context_t *ctx)
|
||||
} else {
|
||||
/* receive or handle fail */
|
||||
ctx->phase = Phase_Non_Start;
|
||||
ctx->size_in_phase = 0;
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
} else {
|
||||
ctx->phase = Phase_Non_Start;
|
||||
ctx->size_in_phase = 0;
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
@ -186,9 +183,8 @@ static int on_imrt_link_byte_arrive(unsigned char ch, recv_context_t *ctx)
|
||||
if (ctx->size_in_phase == ctx->message.payload_size) {
|
||||
ctx->phase = Phase_Non_Start;
|
||||
if (enable_log)
|
||||
app_manager_printf(
|
||||
"##On byte arrive: receive end, payload_size is %d.\n",
|
||||
ctx->message.payload_size);
|
||||
app_manager_printf("##On byte arrive: receive end, payload_size is %d.\n",
|
||||
ctx->message.payload_size);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
||||
@ -6,7 +6,12 @@ set (__APP_MGR_DIR ${CMAKE_CURRENT_LIST_DIR})
|
||||
include_directories(${__APP_MGR_DIR})
|
||||
|
||||
|
||||
file (GLOB source_all ${__APP_MGR_DIR}/*.c ${__APP_MGR_DIR}/platform/${TARGET_PLATFORM}/*.c)
|
||||
file (GLOB source_all ${__APP_MGR_DIR}/*.c ${__APP_MGR_DIR}/platform/${WAMR_BUILD_PLATFORM}/*.c)
|
||||
|
||||
set (APP_MGR_SOURCE ${source_all})
|
||||
|
||||
file (GLOB header
|
||||
${__APP_MGR_DIR}/module_wasm_app.h
|
||||
)
|
||||
LIST (APPEND RUNTIME_LIB_HEADER_LIST ${header})
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include "app_manager.h"
|
||||
#include "app_manager_host.h"
|
||||
#include "event.h"
|
||||
#include "attr_container.h"
|
||||
#include "bi-inc/attr_container.h"
|
||||
#include "bh_memory.h"
|
||||
#include "coap_ext.h"
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include "bh_queue.h"
|
||||
#include "bh_memory.h"
|
||||
#include "bh_thread.h"
|
||||
#include "attr_container.h"
|
||||
#include "bi-inc/attr_container.h"
|
||||
#include "event.h"
|
||||
#include "watchdog.h"
|
||||
#include "coap_ext.h"
|
||||
@ -186,7 +186,8 @@ void release_module(module_data *m_data)
|
||||
watchdog_timer_destroy(&m_data->wd_timer);
|
||||
|
||||
#ifdef HEAP_ENABLED /* TODO */
|
||||
if(m_data->heap) gc_destroy_for_instance(m_data->heap);
|
||||
if(m_data->heap)
|
||||
gc_destroy_for_instance(m_data->heap);
|
||||
#endif
|
||||
|
||||
if (m_data->queue)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -27,6 +27,16 @@ extern "C" {
|
||||
#define SECTION_TYPE_CODE 10
|
||||
#define SECTION_TYPE_DATA 11
|
||||
|
||||
typedef enum AOTSectionType {
|
||||
AOT_SECTION_TYPE_TARGET_INFO = 0,
|
||||
AOT_SECTION_TYPE_INIT_DATA,
|
||||
AOT_SECTION_TYPE_TEXT,
|
||||
AOT_SECTION_TYPE_FUNCTION,
|
||||
AOT_SECTION_TYPE_EXPORT,
|
||||
AOT_SECTION_TYPE_RELOCATION,
|
||||
AOT_SECTION_TYPE_SIGANATURE
|
||||
} AOTSectionType;
|
||||
|
||||
enum {
|
||||
WASM_Msg_Start = BASE_EVENT_MAX,
|
||||
TIMER_EVENT_WASM,
|
||||
@ -42,12 +52,16 @@ typedef struct wasm_data {
|
||||
wasm_module_inst_t wasm_module_inst;
|
||||
/* Permissions of the WASM app */
|
||||
char *perms;
|
||||
/*thread list mapped with this WASM module */
|
||||
/* thread list mapped with this WASM module */
|
||||
korp_tid thread_id;
|
||||
/* for easily access the containing module data */
|
||||
module_data* m_data;
|
||||
/* section list of wasm bytecode */
|
||||
wasm_section_list_t sections;
|
||||
/* is bytecode or aot */
|
||||
bool is_bytecode;
|
||||
/* sections of wasm bytecode or aot file */
|
||||
void *sections;
|
||||
/* execution environment */
|
||||
wasm_exec_env_t exec_env;
|
||||
} wasm_data;
|
||||
|
||||
/* sensor event */
|
||||
@ -59,8 +73,8 @@ typedef struct _sensor_event_data {
|
||||
void *data;
|
||||
} sensor_event_data_t;
|
||||
|
||||
/* WASM App File */
|
||||
typedef struct wasm_app_file {
|
||||
/* WASM Bytecode File */
|
||||
typedef struct wasm_bytecode_file {
|
||||
/* magics */
|
||||
int magic;
|
||||
/* current version */
|
||||
@ -69,6 +83,26 @@ typedef struct wasm_app_file {
|
||||
wasm_section_list_t sections;
|
||||
/* Last WASM section in the list */
|
||||
wasm_section_t *section_end;
|
||||
} wasm_bytecode_file_t;
|
||||
|
||||
/* WASM AOT File */
|
||||
typedef struct wasm_aot_file {
|
||||
/* magics */
|
||||
int magic;
|
||||
/* current version */
|
||||
int version;
|
||||
/* AOT section list */
|
||||
aot_section_list_t sections;
|
||||
/* Last AOT section in the list */
|
||||
aot_section_t *section_end;
|
||||
} wasm_aot_file_t;
|
||||
|
||||
/* WASM App File */
|
||||
typedef struct wasm_app_file_t {
|
||||
union {
|
||||
wasm_bytecode_file_t bytecode;
|
||||
wasm_aot_file_t aot;
|
||||
} u;
|
||||
} wasm_app_file_t;
|
||||
|
||||
extern module_interface wasm_app_module_interface;
|
||||
@ -80,6 +114,25 @@ extern bool wasm_register_msg_callback(int msg_type,
|
||||
typedef void (*resource_cleanup_handler_t)(uint32 module_id);
|
||||
extern bool wasm_register_cleanup_callback(resource_cleanup_handler_t handler);
|
||||
|
||||
/**
|
||||
* Set WASI root dir for modules. On each wasm app installation, a sub dir named
|
||||
* with the app's name will be created autamically. That wasm app can only access
|
||||
* this sub dir.
|
||||
*
|
||||
* @param root_dir the root dir to set
|
||||
* @return true for success, false otherwise
|
||||
*/
|
||||
bool
|
||||
wasm_set_wasi_root_dir(const char *root_dir);
|
||||
|
||||
/**
|
||||
* Get WASI root dir
|
||||
*
|
||||
* @return the WASI root dir
|
||||
*/
|
||||
const char *
|
||||
wasm_get_wasi_root_dir();
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* end of extern "C" */
|
||||
#endif
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
|
||||
|
||||
#include "native_interface.h"
|
||||
#include "shared_utils.h"
|
||||
#include "app_manager.h"
|
||||
#include "app_manager_export.h"
|
||||
#include "attr_container.h"
|
||||
#include "bi-inc/shared_utils.h"
|
||||
#include "bi-inc/attr_container.h"
|
||||
#include "coap_ext.h"
|
||||
|
||||
typedef struct _app_res_register {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#define _APP_MANAGER_EXPORT_H_
|
||||
|
||||
#include "native_interface.h"
|
||||
#include "shared_utils.h"
|
||||
#include "bi-inc/shared_utils.h"
|
||||
#include "bh_queue.h"
|
||||
#include "host_link.h"
|
||||
#include "runtime_timer.h"
|
||||
@ -115,8 +115,8 @@ typedef module_data *(*module_get_module_data_func)(void *inst);
|
||||
*
|
||||
* @return true if success, false otherwise
|
||||
*/
|
||||
typedef bool (*module_on_install_request_byte_arrive_func)(uint8 ch,
|
||||
int total_size, int *received_total_size);
|
||||
typedef bool (*module_on_install_request_byte_arrive_func) (
|
||||
uint8 ch, int total_size, int *received_total_size);
|
||||
|
||||
/* Interfaces of each module */
|
||||
typedef struct module_interface {
|
||||
@ -281,13 +281,12 @@ send_error_response_to_host(int mid, int code, const char *msg);
|
||||
*
|
||||
* @return true if success, false otherwise
|
||||
*/
|
||||
bool
|
||||
bh_applet_check_permission(const char *perm);
|
||||
|
||||
int
|
||||
app_manager_host_send_msg(int msg_type, const unsigned char *buf, int size);
|
||||
|
||||
bool
|
||||
bh_applet_check_permission(const char *perm);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* end of extern "C" */
|
||||
#endif
|
||||
|
||||
@ -10,3 +10,7 @@ file (GLOB_RECURSE source_all ${APP_MGR_SHARED_DIR}/*.c)
|
||||
|
||||
set (APP_MGR_SHARED_SOURCE ${source_all})
|
||||
|
||||
file (GLOB header
|
||||
${APP_MGR_SHARED_DIR}/*.h
|
||||
)
|
||||
LIST (APPEND RUNTIME_LIB_HEADER_LIST ${header})
|
||||
|
||||
@ -11,7 +11,7 @@ typedef enum LINK_MSG_TYPE {
|
||||
COAP_UDP_RAW = 1,
|
||||
REQUEST_PACKET,
|
||||
RESPONSE_PACKET,
|
||||
INSTALL_WASM_BYTECODE_APP,
|
||||
INSTALL_WASM_APP,
|
||||
CBOR_GENERIC = 30,
|
||||
|
||||
LINK_MSG_TYPE_MAX = 50
|
||||
|
||||
@ -44,7 +44,6 @@
|
||||
"iwasm/products/zephyr/sample/src/*.c"
|
||||
],
|
||||
"compile_definitions": [
|
||||
"NVALGRIND",
|
||||
"__JLF__",
|
||||
"__ZEPHYR__"
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user