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

Tests: Convert test-wasm functions to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-10-31 17:05:15 +02:00
parent ae510db72c
commit 10b93506ad
1 changed files with 23 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Tests/LibWasm/test-wasm.cpp
View file

@ -60,8 +60,8 @@ public:
~WebAssemblyModule() override = default; ~WebAssemblyModule() override = default;
private: private:
JS_DECLARE_OLD_NATIVE_FUNCTION(get_export); JS_DECLARE_NATIVE_FUNCTION(get_export);
JS_DECLARE_OLD_NATIVE_FUNCTION(wasm_invoke); JS_DECLARE_NATIVE_FUNCTION(wasm_invoke);
static HashMap<Wasm::Linker::Name, Wasm::ExternValue> const& spec_test_namespace() static HashMap<Wasm::Linker::Name, Wasm::ExternValue> const& spec_test_namespace()
{ {
@ -143,19 +143,17 @@ TESTJS_GLOBAL_FUNCTION(compare_typed_arrays, compareTypedArrays)
void WebAssemblyModule::initialize(JS::GlobalObject& global_object) void WebAssemblyModule::initialize(JS::GlobalObject& global_object)
{ {
Base::initialize(global_object); Base::initialize(global_object);
define_old_native_function("getExport", get_export, 1, JS::default_attributes); define_native_function("getExport", get_export, 1, JS::default_attributes);
define_old_native_function("invoke", wasm_invoke, 1, JS::default_attributes); define_native_function("invoke", wasm_invoke, 1, JS::default_attributes);
} }
JS_DEFINE_OLD_NATIVE_FUNCTION(WebAssemblyModule::get_export) JS_DEFINE_NATIVE_FUNCTION(WebAssemblyModule::get_export)
{ {
auto name = TRY_OR_DISCARD(vm.argument(0).to_string(global_object)); auto name = TRY(vm.argument(0).to_string(global_object));
auto this_value = vm.this_value(global_object); auto this_value = vm.this_value(global_object);
auto* object = TRY_OR_DISCARD(this_value.to_object(global_object)); auto* object = TRY(this_value.to_object(global_object));
if (!is<WebAssemblyModule>(object)) { if (!is<WebAssemblyModule>(object))
vm.throw_exception<JS::TypeError>(global_object, "Not a WebAssemblyModule"); return vm.throw_completion<JS::TypeError>(global_object, "Not a WebAssemblyModule");
return {};
}
auto instance = static_cast<WebAssemblyModule*>(object); auto instance = static_cast<WebAssemblyModule*>(object);
for (auto& entry : instance->module_instance().exports()) { for (auto& entry : instance->module_instance().exports()) {
if (entry.name() == name) { if (entry.name() == name) {
@ -173,49 +171,41 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(WebAssemblyModule::get_export)
[&](const auto& ref) -> JS::Value { return JS::Value(static_cast<double>(ref.address.value())); }); [&](const auto& ref) -> JS::Value { return JS::Value(static_cast<double>(ref.address.value())); });
}); });
} }
vm.throw_exception<JS::TypeError>(global_object, String::formatted("'{}' does not refer to a function or a global", name)); return vm.throw_completion<JS::TypeError>(global_object, String::formatted("'{}' does not refer to a function or a global", name));
return {};
} }
} }
vm.throw_exception<JS::TypeError>(global_object, String::formatted("'{}' could not be found", name)); return vm.throw_completion<JS::TypeError>(global_object, String::formatted("'{}' could not be found", name));
return {};
} }
JS_DEFINE_OLD_NATIVE_FUNCTION(WebAssemblyModule::wasm_invoke) JS_DEFINE_NATIVE_FUNCTION(WebAssemblyModule::wasm_invoke)
{ {
auto address = static_cast<unsigned long>(TRY_OR_DISCARD(vm.argument(0).to_double(global_object))); auto address = static_cast<unsigned long>(TRY(vm.argument(0).to_double(global_object)));
Wasm::FunctionAddress function_address { address }; Wasm::FunctionAddress function_address { address };
auto function_instance = WebAssemblyModule::machine().store().get(function_address); auto function_instance = WebAssemblyModule::machine().store().get(function_address);
if (!function_instance) { if (!function_instance)
vm.throw_exception<JS::TypeError>(global_object, "Invalid function address"); return vm.throw_completion<JS::TypeError>(global_object, "Invalid function address");
return {};
}
const Wasm::FunctionType* type { nullptr }; const Wasm::FunctionType* type { nullptr };
function_instance->visit([&](auto& value) { type = &value.type(); }); function_instance->visit([&](auto& value) { type = &value.type(); });
if (!type) { if (!type)
vm.throw_exception<JS::TypeError>(global_object, "Invalid function found at given address"); return vm.throw_completion<JS::TypeError>(global_object, "Invalid function found at given address");
return {};
}
Vector<Wasm::Value> arguments; Vector<Wasm::Value> arguments;
if (type->parameters().size() + 1 > vm.argument_count()) { if (type->parameters().size() + 1 > vm.argument_count())
vm.throw_exception<JS::TypeError>(global_object, String::formatted("Expected {} arguments for call, but found {}", type->parameters().size() + 1, vm.argument_count())); return vm.throw_completion<JS::TypeError>(global_object, String::formatted("Expected {} arguments for call, but found {}", type->parameters().size() + 1, vm.argument_count()));
return {};
}
size_t index = 1; size_t index = 1;
for (auto& param : type->parameters()) { for (auto& param : type->parameters()) {
auto argument = vm.argument(index++); auto argument = vm.argument(index++);
double double_value = 0; double double_value = 0;
if (!argument.is_bigint()) if (!argument.is_bigint())
double_value = TRY_OR_DISCARD(argument.to_double(global_object)); double_value = TRY(argument.to_double(global_object));
switch (param.kind()) { switch (param.kind()) {
case Wasm::ValueType::Kind::I32: case Wasm::ValueType::Kind::I32:
arguments.append(Wasm::Value(param, static_cast<u64>(double_value))); arguments.append(Wasm::Value(param, static_cast<u64>(double_value)));
break; break;
case Wasm::ValueType::Kind::I64: case Wasm::ValueType::Kind::I64:
if (argument.is_bigint()) { if (argument.is_bigint()) {
auto value = TRY_OR_DISCARD(argument.to_bigint_int64(global_object)); auto value = TRY(argument.to_bigint_int64(global_object));
arguments.append(Wasm::Value(param, bit_cast<u64>(value))); arguments.append(Wasm::Value(param, bit_cast<u64>(value)));
} else { } else {
arguments.append(Wasm::Value(param, static_cast<u64>(double_value))); arguments.append(Wasm::Value(param, static_cast<u64>(double_value)));
@ -243,10 +233,8 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(WebAssemblyModule::wasm_invoke)
} }
auto result = WebAssemblyModule::machine().invoke(function_address, arguments); auto result = WebAssemblyModule::machine().invoke(function_address, arguments);
if (result.is_trap()) { if (result.is_trap())
vm.throw_exception<JS::TypeError>(global_object, String::formatted("Execution trapped: {}", result.trap().reason)); return vm.throw_completion<JS::TypeError>(global_object, String::formatted("Execution trapped: {}", result.trap().reason));
return {};
}
if (result.values().is_empty()) if (result.values().is_empty())
return JS::js_null(); return JS::js_null();