RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:37:47 +00:00
Code Issues Activity Actions

LibWasm: Make the instantiation process produce an OwnPtr

Browse source 
Managing the instantiated modules becomes a pain if they're on the
stack, since an instantiated module will eventually reference itself.
To make using this simpler, just avoid copying the instance.
This commit is contained in:
Ali Mohammad Pur 2021-05-11 04:44:59 +04:30 • committed by Linus Groh
parent efb106069b
commit 3283c8a495
5 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp
View file

@ -85,7 +85,8 @@ GlobalInstance* Store::get(GlobalAddress address)
InstantiationResult AbstractMachine::instantiate(const Module& module, Vector<ExternValue> externs)
{
ModuleInstance main_module_instance;
auto main_module_instance_pointer = make<ModuleInstance>();
auto& main_module_instance = *main_module_instance_pointer;
Optional<InstantiationResult> instantiation_result;
module.for_each_section_of_type<TypeSection>([&](const TypeSection& section) {
@ -181,7 +182,10 @@ InstantiationResult AbstractMachine::instantiate(const Module& module, Vector<Ex
invoke(functions[index.value()], {});
});
return instantiation_result.value_or(move(main_module_instance));
if (instantiation_result.has_value())
return instantiation_result.release_value();
return InstantiationResult { move(main_module_instance_pointer) };
}
Optional<InstantiationError> AbstractMachine::allocate_all(const Module& module, ModuleInstance& module_instance, Vector<ExternValue>& externs, Vector<Value>& global_values)

6
Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
View file

@ -219,7 +219,7 @@ public:
auto& code() const { return m_code; }
private:
const FunctionType& m_type;
FunctionType m_type;
const ModuleInstance& m_module;
const Module::Function& m_code;
};
@ -237,7 +237,7 @@ public:
private:
FlatPtr m_ptr { 0 };
const FunctionType& m_type;
FunctionType m_type;
};
using FunctionInstance = Variant<WasmFunction, HostFunction>;
@ -418,7 +418,7 @@ private:
Vector<EntryType> m_data;
};
using InstantiationResult = AK::Result<ModuleInstance, InstantiationError>;
using InstantiationResult = AK::Result<NonnullOwnPtr<ModuleInstance>, InstantiationError>;
class AbstractMachine {
public: