gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-06-18 02:59:21 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Change is_shared_memory type from bool to uint8 (#2800)

Browse Source 
Change WASMMemoryInstance's field is_shared_memory's type from bool
to uint8 whose size is fixed, so as to make WASMMemoryInstance's size
and layout fixed and not break AOT ABI.

See discussion in https://github.com/bytecodealliance/wasm-micro-runtime/pull/2682.
This commit is contained in:
Wenyong Huang 2023-11-22 10:38:08 +08:00 committed by GitHub
parent 0b29904f26
commit 4d5eb346fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/iwasm/aot/aot_runtime.c
View File

@ -605,7 +605,7 @@ memory_instantiate(AOTModuleInstance *module_inst, AOTModuleInstance *parent,
#if WASM_ENABLE_SHARED_MEMORY != 0 #if WASM_ENABLE_SHARED_MEMORY != 0
if (is_shared_memory) { if (is_shared_memory) {
memory_inst->is_shared_memory = true; memory_inst->is_shared_memory = 1;
memory_inst->ref_count = 1; memory_inst->ref_count = 1;
} }
#endif #endif

2
core/iwasm/interpreter/wasm_runtime.c
View File

@ -386,7 +386,7 @@ memory_instantiate(WASMModuleInstance *module_inst, WASMModuleInstance *parent,
#if WASM_ENABLE_SHARED_MEMORY != 0 #if WASM_ENABLE_SHARED_MEMORY != 0
if (is_shared_memory) { if (is_shared_memory) {
memory->is_shared_memory = true; memory->is_shared_memory = 1;
memory->ref_count = 1; memory->ref_count = 1;
} }
#endif #endif

11
core/iwasm/interpreter/wasm_runtime.h
View File

@ -81,10 +81,15 @@ struct WASMMemoryInstance {
/* Module type */ /* Module type */
uint32 module_type; uint32 module_type;
bool is_shared_memory; /* Whether the memory is shared */
uint8 is_shared_memory;
/* Shared memory flag */ /* One byte padding */
bh_atomic_16_t ref_count; /* 0: non-shared, > 0: reference count */ uint8 __padding__;
/* Reference count of the memory instance:
0: non-shared memory, > 0: shared memory */
bh_atomic_16_t ref_count;
/* Number bytes per page */ /* Number bytes per page */
uint32 num_bytes_per_page; uint32 num_bytes_per_page;