Skip to content

Fix some typo and unify the AOT file format for init data #2915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 27, 2023
Merged

Fix some typo and unify the AOT file format for init data #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a2d658
Fix some typo and unify the AOT file format for init data
TianlongLiang Dec 20, 2023
7f49c76
code styles
TianlongLiang Dec 20, 2023
eb0dc5e
paddings for function type
TianlongLiang Dec 21, 2023
f280ef1
remove func type info paddings for non GC AOT file
TianlongLiang Dec 22, 2023
f4b49d8
cr suggestions and enable ref_types in all spec test
TianlongLiang Dec 26, 2023
bf2dd5e
update thread proposal spec test ignore cases for ref types
TianlongLiang Dec 26, 2023
8befa04
some update
TianlongLiang Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 29 additions & 45 deletions core/iwasm/aot/aot_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,11 @@ destroy_mem_init_data_list(AOTMemInitData **data_list, uint32 count)
wasm_runtime_free(data_list);
}

static bool
load_init_expr(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
InitializerExpression *expr, char *error_buf,
uint32 error_buf_size);

static bool
load_mem_init_data_list(const uint8 **p_buf, const uint8 *buf_end,
AOTModule *module, char *error_buf,
Expand All @@ -1029,15 +1034,17 @@ load_mem_init_data_list(const uint8 **p_buf, const uint8 *buf_end,

/* Create each memory data segment */
for (i = 0; i < module->mem_init_data_count; i++) {
uint32 init_expr_type, byte_count;
uint64 init_expr_value;
uint32 byte_count;
uint32 is_passive;
uint32 memory_index;
InitializerExpression init_value;

read_uint32(buf, buf_end, is_passive);
read_uint32(buf, buf_end, memory_index);
read_uint32(buf, buf_end, init_expr_type);
read_uint64(buf, buf_end, init_expr_value);
if (!load_init_expr(&buf, buf_end, module, &init_value, error_buf,
error_buf_size)) {
return false;
}
read_uint32(buf, buf_end, byte_count);
size = offsetof(AOTMemInitData, bytes) + (uint64)byte_count;
if (!(data_list[i] = loader_malloc(size, error_buf, error_buf_size))) {
Expand All @@ -1049,8 +1056,8 @@ load_mem_init_data_list(const uint8 **p_buf, const uint8 *buf_end,
data_list[i]->is_passive = (bool)is_passive;
data_list[i]->memory_index = memory_index;
#endif
data_list[i]->offset.init_expr_type = (uint8)init_expr_type;
data_list[i]->offset.u.i64 = (int64)init_expr_value;
data_list[i]->offset.init_expr_type = init_value.init_expr_type;
data_list[i]->offset.u = init_value.u;
data_list[i]->byte_count = byte_count;
read_byte_array(buf, buf_end, data_list[i]->bytes,
data_list[i]->byte_count);
Expand Down Expand Up @@ -1143,14 +1150,14 @@ destroy_table_init_data_list(AOTTableInitData **data_list, uint32 count)
wasm_runtime_free(data_list);
}

#if WASM_ENABLE_GC != 0
static bool
load_init_expr(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
InitializerExpression *expr, char *error_buf,
uint32 error_buf_size)
{
const uint8 *buf = *p_buf;
uint32 init_expr_type = 0;
uint64 *i64x2 = NULL;
bool free_if_fail = false;

buf = (uint8 *)align_ptr(buf, 4);
Expand All @@ -1169,17 +1176,21 @@ load_init_expr(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
read_uint64(buf, buf_end, expr->u.i64);
break;
case INIT_EXPR_TYPE_V128_CONST:
read_byte_array(buf, buf_end, &expr->u.v128, sizeof(expr->u.v128));
i64x2 = (uint64 *)expr->u.v128.i64x2;
CHECK_BUF(buf, buf_end, sizeof(uint64) * 2);
wasm_runtime_read_v128(buf, &i64x2[0], &i64x2[1]);
buf += sizeof(uint64) * 2;
break;
case INIT_EXPR_TYPE_GET_GLOBAL:
read_uint32(buf, buf_end, expr->u.global_index);
break;
case INIT_EXPR_TYPE_REFNULL_CONST:
read_uint32(buf, buf_end, expr->u.type_index);
break;
#if WASM_ENABLE_GC != 0 || WASM_ENABLE_REF_TYPES != 0
case INIT_EXPR_TYPE_FUNCREF_CONST:
case INIT_EXPR_TYPE_REFNULL_CONST:
read_uint32(buf, buf_end, expr->u.ref_index);
break;
#endif /* end of WASM_ENABLE_GC != 0 || WASM_ENABLE_REF_TYPES != 0 */
#if WASM_ENABLE_GC != 0
case INIT_EXPR_TYPE_I31_NEW:
read_uint32(buf, buf_end, expr->u.i32);
break;
Expand Down Expand Up @@ -1301,6 +1312,7 @@ load_init_expr(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
}
break;
}
#endif /* end of WASM_ENABLE_GC != 0 */
default:
set_error_buf(error_buf, error_buf_size, "invalid init expr type.");
return false;
Expand All @@ -1311,12 +1323,15 @@ load_init_expr(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
*p_buf = buf;
return true;
fail:
#if WASM_ENABLE_GC != 0
if (free_if_fail) {
wasm_runtime_free(expr->u.data);
}
#else
(void)free_if_fail;
#endif
return false;
}
#endif /* end of WASM_ENABLE_GC != 0 */

static bool
load_import_table_list(const uint8 **p_buf, const uint8 *buf_end,
Expand Down Expand Up @@ -1505,20 +1520,10 @@ load_table_init_data_list(const uint8 **p_buf, const uint8 *buf_end,
data_list[i]->offset.u.i64 = (int64)init_expr_value;
data_list[i]->value_count = value_count;
for (j = 0; j < data_list[i]->value_count; j++) {
#if WASM_ENABLE_GC != 0
if (!load_init_expr(&buf, buf_end, module,
&data_list[i]->init_values[j], error_buf,
error_buf_size))
return false;
#else
data_list[i]->init_values[j].init_expr_type =
INIT_EXPR_TYPE_FUNCREF_CONST;
#if UINTPTR_MAX == UINT64_MAX
read_uint64(buf, buf_end, data_list[i]->init_values[j].u.ref_index);
#else
read_uint32(buf, buf_end, data_list[i]->init_values[j].u.ref_index);
#endif
#endif /* end of WASM_ENABLE_GC != 0 */
}
}

Expand Down Expand Up @@ -1947,9 +1952,6 @@ load_types(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,

buf = align_ptr(buf, 4);
read_uint16(buf, buf_end, type_flag);
/* Dummy read to ignore the is_sub_final and parent_type_idx */
read_uint16(buf, buf_end, param_count);
read_uint32(buf, buf_end, param_count);
read_uint16(buf, buf_end, param_count);
read_uint16(buf, buf_end, result_count);

Expand Down Expand Up @@ -2119,32 +2121,14 @@ load_globals(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,

/* Create each global */
for (i = 0; i < module->global_count; i++) {
#if WASM_ENABLE_GC == 0
uint16 init_expr_type;
#endif

read_uint8(buf, buf_end, globals[i].type);
read_uint8(buf, buf_end, globals[i].is_mutable);

#if WASM_ENABLE_GC != 0
buf = align_ptr(buf, 4);

if (!load_init_expr(&buf, buf_end, module, &globals[i].init_expr,
error_buf, error_buf_size))
return false;
#else
read_uint16(buf, buf_end, init_expr_type);

if (init_expr_type != INIT_EXPR_TYPE_V128_CONST) {
read_uint64(buf, buf_end, globals[i].init_expr.u.i64);
}
else {
uint64 *i64x2 = (uint64 *)globals[i].init_expr.u.v128.i64x2;
CHECK_BUF(buf, buf_end, sizeof(uint64) * 2);
wasm_runtime_read_v128(buf, &i64x2[0], &i64x2[1]);
buf += sizeof(uint64) * 2;
}

globals[i].init_expr.init_expr_type = (uint8)init_expr_type;
#endif /* end of WASM_ENABLE_GC != 0 */

globals[i].size = wasm_value_type_size(globals[i].type);
globals[i].data_offset = data_offset;
Expand Down
Loading