Skip to content

Commit b9039f9

Browse files
author
Georgii Rylov
committed
Merge branch 'main' into godjan/iterate_callstack
2 parents 478b373 + b6dea22 commit b9039f9

File tree

11 files changed

+958
-798
lines changed

11 files changed

+958
-798
lines changed

‎.github/workflows/spec_test_on_nuttx.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ jobs:
127127
wamr_feature_option:
128128
# Empty option for default
129129
- { option: "", mode: "" }
130-
- { option: "CONFIG_INTERPRETERS_WAMR_GC CONFIG_INTERPRETERS_WAMR_AOT_STACK_FRAME", mode: "-G" }
130+
# need to install menhir
131+
# - { option: "CONFIG_INTERPRETERS_WAMR_GC CONFIG_INTERPRETERS_WAMR_AOT_STACK_FRAME", mode: "-G" }
131132

132133
exclude:
133134
# XIP is not fully supported yet on RISCV64, some relocations can not be resolved

‎core/iwasm/common/wasm_runtime_common.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3047,17 +3047,17 @@ static const char *exception_msgs[] = {
30473047
"wasm operand stack overflow", /* EXCE_OPERAND_STACK_OVERFLOW */
30483048
"failed to compile fast jit function", /* EXCE_FAILED_TO_COMPILE_FAST_JIT_FUNC */
30493049
/* GC related exceptions */
3050-
"null function object", /* EXCE_NULL_FUNC_OBJ */
3051-
"null structure object", /* EXCE_NULL_STRUCT_OBJ */
3052-
"null array reference", /* EXCE_NULL_ARRAY_OBJ */
3050+
"null function reference", /* EXCE_NULL_FUNC_OBJ */
3051+
"null structure reference", /* EXCE_NULL_STRUCT_OBJ */
3052+
"null array reference", /* EXCE_NULL_ARRAY_OBJ */
30533053
"null i31 reference", /* EXCE_NULL_I31_OBJ */
30543054
"null reference", /* EXCE_NULL_REFERENCE */
30553055
"create rtt type failed", /* EXCE_FAILED_TO_CREATE_RTT_TYPE */
30563056
"create struct object failed", /* EXCE_FAILED_TO_CREATE_STRUCT_OBJ */
30573057
"create array object failed", /* EXCE_FAILED_TO_CREATE_ARRAY_OBJ */
30583058
"create externref object failed", /* EXCE_FAILED_TO_CREATE_EXTERNREF_OBJ */
30593059
"cast failure", /* EXCE_CAST_FAILURE */
3060-
"out of bounds array access", /* EXCE_ARRAY_IDX_OOB */
3060+
"out of bounds array access", /* EXCE_ARRAY_IDX_OOB */
30613061
/* stringref related exceptions */
30623062
"create string object failed", /* EXCE_FAILED_TO_CREATE_STRING */
30633063
"create stringref failed", /* EXCE_FAILED_TO_CREATE_STRINGREF */

‎core/iwasm/interpreter/wasm_interp_classic.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2649,7 +2649,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
26492649
read_leb_uint32(frame_ip, frame_ip_end, type_index);
26502650
func_obj = POP_REF();
26512651
if (!func_obj) {
2652-
wasm_set_exception(module, "null function object");
2652+
wasm_set_exception(module, "null function reference");
26532653
goto got_exception;
26542654
}
26552655

@@ -2666,7 +2666,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
26662666
read_leb_uint32(frame_ip, frame_ip_end, type_index);
26672667
func_obj = POP_REF();
26682668
if (!func_obj) {
2669-
wasm_set_exception(module, "null function object");
2669+
wasm_set_exception(module, "null function reference");
26702670
goto got_exception;
26712671
}
26722672

@@ -2813,7 +2813,8 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
28132813
struct_obj = POP_REF();
28142814

28152815
if (!struct_obj) {
2816-
wasm_set_exception(module, "null structure object");
2816+
wasm_set_exception(module,
2817+
"null structure reference");
28172818
goto got_exception;
28182819
}
28192820

@@ -2869,7 +2870,8 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
28692870

28702871
struct_obj = POP_REF();
28712872
if (!struct_obj) {
2872-
wasm_set_exception(module, "null structure object");
2873+
wasm_set_exception(module,
2874+
"null structure reference");
28732875
goto got_exception;
28742876
}
28752877

‎core/iwasm/interpreter/wasm_interp_fast.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
19921992
#endif
19931993
func_obj = POP_REF();
19941994
if (!func_obj) {
1995-
wasm_set_exception(module, "null function object");
1995+
wasm_set_exception(module, "null function reference");
19961996
goto got_exception;
19971997
}
19981998

@@ -2007,7 +2007,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
20072007
#endif
20082008
func_obj = POP_REF();
20092009
if (!func_obj) {
2010-
wasm_set_exception(module, "null function object");
2010+
wasm_set_exception(module, "null function reference");
20112011
goto got_exception;
20122012
}
20132013

@@ -2148,7 +2148,8 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
21482148
struct_obj = POP_REF();
21492149

21502150
if (!struct_obj) {
2151-
wasm_set_exception(module, "null structure object");
2151+
wasm_set_exception(module,
2152+
"null structure reference");
21522153
goto got_exception;
21532154
}
21542155

@@ -2204,7 +2205,8 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
22042205

22052206
struct_obj = POP_REF();
22062207
if (!struct_obj) {
2207-
wasm_set_exception(module, "null structure object");
2208+
wasm_set_exception(module,
2209+
"null structure reference");
22082210
goto got_exception;
22092211
}
22102212

0 commit comments

Comments
 (0)