Skip to content

Refactor instance to avoid keeping a copy of Module #233

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

Closed
axic wants to merge 1 commit into from
Closed

Refactor instance to avoid keeping a copy of Module #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 18 additions & 23 deletions lib/fizzy/execute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,8 @@ Instance instantiate(const Module& module, std::vector<ImportedFunction> importe
assert(module.elementsec.empty() || !module.tablesec.empty());
for (const auto& element : module.elementsec)
{
uint64_t offset;
if (element.offset.kind == ConstantExpression::Kind::Constant)
offset = element.offset.value.constant;
else
throw std::runtime_error(
"element initialization by imported global is not supported yet");
const uint64_t offset =
eval_constant_expression(element.offset, imported_globals, module.globalsec, globals);

// Overwrite table[offset..] with element.init
assert((offset + element.init.size()) <= table.size());
Expand All @@ -371,9 +367,9 @@ Instance instantiate(const Module& module, std::vector<ImportedFunction> importe
std::memcpy(memory.data() + offset, data.init.data(), data.init.size());
}

Instance instance = {module, std::move(memory), memory_max, std::move(table),
Instance instance = {module.codesec, std::move(memory), memory_max, std::move(table),
std::move(globals), std::move(imported_functions), std::move(imported_function_types),
std::move(imported_globals)};
std::move(imported_globals), module.typesec, module.funcsec, module.globalsec};

// Run start function if present
if (module.startfunc)
Expand All @@ -391,9 +387,9 @@ execution_result execute(Instance& instance, FuncIdx func_idx, std::vector<uint6
return instance.imported_functions[func_idx](instance, std::move(args));

const auto code_idx = func_idx - instance.imported_functions.size();
assert(code_idx < instance.module.codesec.size());
assert(code_idx < instance.codesec.size());

const auto& code = instance.module.codesec[code_idx];
const auto& code = instance.codesec[code_idx];

std::vector<uint64_t> locals = std::move(args);
locals.resize(locals.size() + code.local_count);
Expand Down Expand Up @@ -479,15 +475,14 @@ execution_result execute(Instance& instance, FuncIdx func_idx, std::vector<uint6
case Instr::call:
{
const auto called_func_idx = read<uint32_t>(immediates);
assert(called_func_idx <
instance.imported_functions.size() + instance.module.funcsec.size());
assert(called_func_idx < instance.imported_functions.size() + instance.funcsec.size());
const auto type_idx =
called_func_idx < instance.imported_functions.size() ?
instance.imported_function_types[called_func_idx] :
instance.module.funcsec[called_func_idx - instance.imported_functions.size()];
assert(type_idx < instance.module.typesec.size());
instance.funcsec[called_func_idx - instance.imported_functions.size()];
assert(type_idx < instance.typesec.size());

const auto num_inputs = instance.module.typesec[type_idx].inputs.size();
const auto num_inputs = instance.typesec[type_idx].inputs.size();
assert(stack.size() >= num_inputs);
std::vector<uint64_t> call_args(
stack.rbegin(), stack.rbegin() + static_cast<ptrdiff_t>(num_inputs));
Expand All @@ -501,7 +496,7 @@ execution_result execute(Instance& instance, FuncIdx func_idx, std::vector<uint6
goto end;
}

const auto num_outputs = instance.module.typesec[type_idx].outputs.size();
const auto num_outputs = instance.typesec[type_idx].outputs.size();
// NOTE: we can assume these two from validation
assert(ret.stack.size() == num_outputs);
assert(num_outputs <= 1);
Expand All @@ -516,10 +511,10 @@ execution_result execute(Instance& instance, FuncIdx func_idx, std::vector<uint6
// TODO: Not needed, but satisfies the assert in the end of the main loop.
labels.clear();

assert(code_idx < instance.module.funcsec.size());
const auto type_idx = instance.module.funcsec[code_idx];
assert(type_idx < instance.module.typesec.size());
const bool have_result = !instance.module.typesec[type_idx].outputs.empty();
assert(code_idx < instance.funcsec.size());
const auto type_idx = instance.funcsec[code_idx];
assert(type_idx < instance.typesec.size());
const bool have_result = !instance.typesec[type_idx].outputs.empty();

if (have_result)
{
Expand Down Expand Up @@ -581,7 +576,7 @@ execution_result execute(Instance& instance, FuncIdx func_idx, std::vector<uint6
else
{
const auto module_global_idx = idx - instance.imported_globals.size();
assert(module_global_idx < instance.module.globalsec.size());
assert(module_global_idx < instance.globalsec.size());
stack.push(instance.globals[module_global_idx]);
}
break;
Expand All @@ -597,8 +592,8 @@ execution_result execute(Instance& instance, FuncIdx func_idx, std::vector<uint6
else
{
const auto module_global_idx = idx - instance.imported_globals.size();
assert(module_global_idx < instance.module.globalsec.size());
assert(instance.module.globalsec[module_global_idx].is_mutable);
assert(module_global_idx < instance.globalsec.size());
assert(instance.globalsec[module_global_idx].is_mutable);
instance.globals[module_global_idx] = stack.pop();
}
break;
Expand Down
5 changes: 4 additions & 1 deletion lib/fizzy/execute.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,17 @@ struct ImportedGlobal
// The module instance.
struct Instance
{
const Module& module;
std::vector<Code> codesec;
bytes memory;
size_t memory_max_pages = 0;
std::vector<FuncIdx> table;
std::vector<uint64_t> globals;
std::vector<ImportedFunction> imported_functions;
std::vector<TypeIdx> imported_function_types;
std::vector<ImportedGlobal> imported_globals;
std::vector<FuncType> typesec;
std::vector<TypeIdx> funcsec;
std::vector<Global> globalsec;
};

// Instantiate a module.
Expand Down