christoph/wamr
1
Fork 0
Code Releases Activity

Implement wasm-c-api frame/trap APIs for AOT mode (#663)

Browse Source 
And update CI workflow to build/cache llvm and run wasm-c-api samples.
This commit is contained in:
Wenyong Huang
2021-07-13 09:01:03 +08:00
committed by GitHub
parent b554a9d05d
commit 0f1ce9ef3d
10 changed files with 160 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/iwasm/common/wasm_c_api.c
View File

@ -1435,6 +1435,12 @@ wasm_trap_new_internal(WASMModuleInstanceCommon *inst_comm_rt,
trap->frames = ((WASMModuleInstance *)inst_comm_rt)->frames;
}
#endif
#if WASM_ENABLE_AOT != 0
if (inst_comm_rt->module_type == Wasm_Module_AoT) {
trap->frames = ((AOTModuleInstance *)inst_comm_rt)->frames.ptr;
}
#endif
#endif /* WASM_ENABLE_DUMP_CALL_STACK != 0 */
/* allow a NULL frames list */

7
core/iwasm/common/wasm_c_api_internal.h
View File

@ -86,13 +86,6 @@ struct wasm_ref_t {
uint32 obj;
};
struct wasm_frame_t {
wasm_instance_t *instance;
uint32 module_offset;
uint32 func_index;
uint32 func_offset;
};
struct wasm_trap_t {
wasm_byte_vec_t *message;
Vector *frames;

8
core/iwasm/common/wasm_runtime_common.h
View File

@ -336,6 +336,14 @@ typedef struct WASMMemoryInstanceCommon {
typedef package_type_t PackageType;
typedef wasm_section_t WASMSection, AOTSection;
typedef struct wasm_frame_t {
/* wasm_instance_t */
void *instance;
uint32 module_offset;
uint32 func_index;
uint32 func_offset;
} WASMCApiFrame;
/* See wasm_export.h for description */
WASM_RUNTIME_API_EXTERN bool
wasm_runtime_init(void);