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:
@ -9,6 +9,7 @@
|
||||
#include "SDL2/SDL.h"
|
||||
#include "sys/time.h"
|
||||
#include "wasm_export.h"
|
||||
#include "app_manager_export.h"
|
||||
|
||||
#define MONITOR_HOR_RES 320
|
||||
#define MONITOR_VER_RES 240
|
||||
@ -23,7 +24,7 @@ void monitor_sdl_clean_up(void);
|
||||
static uint32_t tft_fb[MONITOR_HOR_RES * MONITOR_VER_RES];
|
||||
|
||||
int
|
||||
time_get_ms(wasm_module_inst_t module_inst)
|
||||
time_get_ms(wasm_exec_env_t exec_env)
|
||||
{
|
||||
static struct timeval tv;
|
||||
gettimeofday(&tv, NULL);
|
||||
@ -146,15 +147,16 @@ void monitor_map(int32_t x1, int32_t y1, int32_t x2, int32_t y2,
|
||||
|
||||
|
||||
void
|
||||
display_init(wasm_module_inst_t module_inst)
|
||||
display_init(wasm_exec_env_t exec_env)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
display_flush(wasm_module_inst_t module_inst,
|
||||
display_flush(wasm_exec_env_t exec_env,
|
||||
int32_t x1, int32_t y1, int32_t x2, int32_t y2,
|
||||
int32 color_p_offset)
|
||||
{
|
||||
wasm_module_inst_t module_inst = get_module_inst(exec_env);
|
||||
if (!wasm_runtime_validate_app_addr(module_inst, color_p_offset, 1))
|
||||
return;
|
||||
lv_color_t * color_p = wasm_runtime_addr_app_to_native(module_inst,
|
||||
@ -164,7 +166,7 @@ display_flush(wasm_module_inst_t module_inst,
|
||||
}
|
||||
|
||||
void
|
||||
display_fill(wasm_module_inst_t module_inst,
|
||||
display_fill(wasm_exec_env_t exec_env,
|
||||
int32_t x1, int32_t y1, int32_t x2, int32_t y2,
|
||||
lv_color_t color_p)
|
||||
{
|
||||
@ -172,7 +174,7 @@ display_fill(wasm_module_inst_t module_inst,
|
||||
}
|
||||
|
||||
void
|
||||
display_map(wasm_module_inst_t module_inst,
|
||||
display_map(wasm_exec_env_t exec_env,
|
||||
int32_t x1, int32_t y1, int32_t x2, int32_t y2,
|
||||
const lv_color_t * color_p)
|
||||
{
|
||||
@ -180,9 +182,10 @@ display_map(wasm_module_inst_t module_inst,
|
||||
}
|
||||
|
||||
bool
|
||||
display_input_read(wasm_module_inst_t module_inst,
|
||||
display_input_read(wasm_exec_env_t exec_env,
|
||||
int32 data_p_offset)
|
||||
{
|
||||
wasm_module_inst_t module_inst = get_module_inst(exec_env);
|
||||
bool ret;
|
||||
if (!wasm_runtime_validate_app_addr(module_inst, data_p_offset, 1))
|
||||
return false;
|
||||
@ -209,15 +212,16 @@ display_input_read(wasm_module_inst_t module_inst,
|
||||
}
|
||||
|
||||
void
|
||||
display_deinit(wasm_module_inst_t module_inst)
|
||||
display_deinit(wasm_exec_env_t exec_env)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
display_vdb_write(wasm_module_inst_t module_inst,
|
||||
display_vdb_write(wasm_exec_env_t exec_env,
|
||||
int32 buf_offset, lv_coord_t buf_w, lv_coord_t x,
|
||||
lv_coord_t y, int32 color_p_offset, lv_opa_t opa)
|
||||
{
|
||||
wasm_module_inst_t module_inst = get_module_inst(exec_env);
|
||||
if (!wasm_runtime_validate_app_addr(module_inst, color_p_offset, 1))
|
||||
return;
|
||||
lv_color_t *color = wasm_runtime_addr_app_to_native(module_inst,
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "bh_thread.h"
|
||||
#include "bh_memory.h"
|
||||
#include "runtime_sensor.h"
|
||||
#include "attr_container.h"
|
||||
#include "bi-inc/attr_container.h"
|
||||
#include "module_wasm_app.h"
|
||||
#include "wasm_export.h"
|
||||
#define MAX 2048
|
||||
@ -345,7 +345,7 @@ static host_interface interface = { .send = uart_send, .destroy = uart_destroy }
|
||||
#endif
|
||||
|
||||
#ifdef __x86_64__
|
||||
static char global_heap_buf[300 * 1024] = { 0 };
|
||||
static char global_heap_buf[400 * 1024] = { 0 };
|
||||
#else
|
||||
static char global_heap_buf[270 * 1024] = { 0 };
|
||||
#endif
|
||||
@ -370,6 +370,8 @@ static void showUsage()
|
||||
printf("\t<Uart Device> represents the UART device name and the default is /dev/ttyS2\n");
|
||||
printf("\t<Baudrate> represents the UART device baudrate and the default is 115200\n");
|
||||
#endif
|
||||
printf("\nNote:\n");
|
||||
printf("\tUse -w|--wasi_root to specify the root dir (default to '.') of WASI wasm modules. \n");
|
||||
}
|
||||
|
||||
static bool parse_args(int argc, char *argv[])
|
||||
@ -378,7 +380,7 @@ static bool parse_args(int argc, char *argv[])
|
||||
|
||||
while (1) {
|
||||
int optIndex = 0;
|
||||
static struct option longOpts[] = {
|
||||
static struct option longOpts[] = {
|
||||
#ifndef CONNECTION_UART
|
||||
{ "server_mode", no_argument, NULL, 's' },
|
||||
{ "host_address", required_argument, NULL, 'a' },
|
||||
@ -387,11 +389,12 @@ static bool parse_args(int argc, char *argv[])
|
||||
{ "uart", required_argument, NULL, 'u' },
|
||||
{ "baudrate", required_argument, NULL, 'b' },
|
||||
#endif
|
||||
{ "wasi_root", required_argument, NULL, 'w' },
|
||||
{ "help", required_argument, NULL, 'h' },
|
||||
{ 0, 0, 0, 0 }
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
c = getopt_long(argc, argv, "sa:p:u:b:h", longOpts, &optIndex);
|
||||
c = getopt_long(argc, argv, "sa:p:u:b:w:h", longOpts, &optIndex);
|
||||
if (c == -1)
|
||||
break;
|
||||
|
||||
@ -418,6 +421,12 @@ static bool parse_args(int argc, char *argv[])
|
||||
printf("uart baudrate: %s\n", optarg);
|
||||
break;
|
||||
#endif
|
||||
case 'w':
|
||||
if (!wasm_set_wasi_root_dir(optarg)) {
|
||||
printf("Fail to set wasi root dir: %s\n", optarg);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'h':
|
||||
showUsage();
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user