Skip to content
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

Fix memory size not updating #2898

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Fix memory size not updating #2898

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01c9514
Fix memory size not updating
yagehu Dec 11, 2023
8f92c14
Fix memory.grow in `wasm_interp_fast.c` as well
yagehu Dec 11, 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
4 changes: 4 additions & 0 deletions core/iwasm/interpreter/wasm_interp_classic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,7 +2149,11 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
#if !defined(OS_ENABLE_HW_BOUND_CHECK) \
|| WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
|| WASM_ENABLE_BULK_MEMORY != 0
#if WASM_ENABLE_THREAD_MGR == 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to be consistent with what we do at the beginning of the function:

wasm-micro-runtime/core/iwasm/interpreter/wasm_interp_classic.c

Lines 1160 to 1164 in 4aee3cf

#if WASM_ENABLE_THREAD_MGR == 0
linear_mem_size = memory->memory_data_size;
#else
linear_mem_size = GET_LINEAR_MEMORY_SIZE(memory);
#endif

Also, similar changes need to be made for wasm_interp_fast.c. See #2834

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review. I just pushed another commit that makes the check consistent and applies the same fix to wasm_interp_fast.c.

linear_mem_size = memory->memory_data_size;
#else
linear_mem_size = get_linear_mem_size();
#endif
#endif
}

Expand Down