Skip to content

wamr: avoids .wasm binary content copying. #332

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.

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 1 commit into from
Mar 16, 2023
Merged
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions src/wamr/wamr.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,12 @@ bool Wamr::load(std::string_view bytecode, std::string_view /*precompiled*/,
return false;
}

WasmByteVec vec;
wasm_byte_vec_new(vec.get(), bytecode.size(), bytecode.data());

module_ = wasm_module_new(store_.get(), vec.get());
wasm_byte_vec_t binary = {.size = bytecode.size(),
.data = (char *)bytecode.data(),
.num_elems = bytecode.size(),
.size_of_elem = sizeof(byte_t),
.lock = nullptr};
module_ = wasm_module_new(store_.get(), &binary);
if (module_ == nullptr) {
return false;
}
Expand Down Expand Up @@ -344,11 +346,10 @@ bool Wamr::link(std::string_view /*debug_name*/) {
wasm_instance_exports(instance_.get(), exports.get());

for (size_t i = 0; i < export_types.get()->size; i++) {
const wasm_externtype_t *exp_extern_type = wasm_exporttype_type(export_types.get()->data[i]);
wasm_extern_t *actual_extern = exports.get()->data[i];

wasm_externkind_t kind = wasm_extern_kind(actual_extern);
assert(kind == wasm_externtype_kind(exp_extern_type));
assert(kind == wasm_externtype_kind(wasm_exporttype_type(export_types.get()->data[i])));
switch (kind) {
case WASM_EXTERN_FUNC: {
WasmFuncPtr func = wasm_func_copy(wasm_extern_as_func(actual_extern));
Expand Down