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

LibWasm: Trap instead of VERIFY()'ing

Browse source 
...unless something really is an assertion.
This commit is contained in:
Ali Mohammad Pur 2021-05-07 09:59:18 +04:30 • committed by Linus Groh
parent b3c13c3e8a
commit 541091500c
3 changed files with 144 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWasm/AbstractMachine/Configuration.cpp
View file

@ -59,6 +59,8 @@ Result Configuration::execute()
{ {
Interpreter interpreter; Interpreter interpreter;
interpreter.interpret(*this); interpreter.interpret(*this);
if (interpreter.did_trap())
return Trap {};
Vector<NonnullOwnPtr<Value>> results; Vector<NonnullOwnPtr<Value>> results;
for (size_t i = 0; i < m_current_frame->arity(); ++i) for (size_t i = 0; i < m_current_frame->arity(); ++i)

214
Userland/Libraries/LibWasm/AbstractMachine/Interpreter.cpp
View file

@ -14,6 +14,12 @@
namespace Wasm { namespace Wasm {
#define TRAP_IF_NOT(x) \
do { \
if (trap_if_not(x)) \
return; \
} while (false)
void Interpreter::interpret(Configuration& configuration) void Interpreter::interpret(Configuration& configuration)
{ {
auto& instructions = configuration.frame()->expression().instructions(); auto& instructions = configuration.frame()->expression().instructions();
@ -23,22 +29,21 @@ void Interpreter::interpret(Configuration& configuration)
while (current_ip_value < max_ip_value) { while (current_ip_value < max_ip_value) {
auto& instruction = instructions[current_ip_value.value()]; auto& instruction = instructions[current_ip_value.value()];
interpret(configuration, current_ip_value, instruction); interpret(configuration, current_ip_value, instruction);
if (m_do_trap)
return;
++current_ip_value; ++current_ip_value;
} }
} }
void Interpreter::branch_to_label(Configuration& configuration, LabelIndex index) void Interpreter::branch_to_label(Configuration& configuration, LabelIndex index)
{ {
dbgln_if(WASM_TRACE_DEBUG, "Branch to label with index {}...", index.value());
auto label = configuration.nth_label(index.value()); auto label = configuration.nth_label(index.value());
VERIFY(label.has_value()); TRAP_IF_NOT(label.has_value());
NonnullOwnPtrVector<Value> results; dbgln_if(WASM_TRACE_DEBUG, "...which is actually IP {}, and has {} result(s)", label->continuation().value(), label->arity());
// Pop results in order auto results = pop_values(configuration, label->arity());
for (size_t i = 0; i < label->arity(); ++i)
results.append(move(configuration.stack().pop().get<NonnullOwnPtr<Value>>()));
size_t drop_count = index.value() + 1; size_t drop_count = index.value() + 1;
if (label->continuation() < configuration.ip())
--drop_count;
for (; !configuration.stack().is_empty();) { for (; !configuration.stack().is_empty();) {
auto entry = configuration.stack().pop(); auto entry = configuration.stack().pop();
@ -59,12 +64,19 @@ ReadonlyBytes Interpreter::load_from_memory(Configuration& configuration, const
{ {
auto& address = configuration.frame()->module().memories().first(); auto& address = configuration.frame()->module().memories().first();
auto memory = configuration.store().get(address); auto memory = configuration.store().get(address);
VERIFY(memory); if (!memory) {
m_do_trap = true;
return {};
}
auto& arg = instruction.arguments().get<Instruction::MemoryArgument>(); auto& arg = instruction.arguments().get<Instruction::MemoryArgument>();
auto base = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>(); auto base = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>();
VERIFY(base.has_value()); if (!base.has_value()) {
m_do_trap = true;
return {};
}
auto instance_address = base.value() + static_cast<i64>(arg.offset); auto instance_address = base.value() + static_cast<i64>(arg.offset);
if (instance_address < 0 || static_cast<u64>(instance_address + size) > memory->size()) { if (instance_address < 0 || static_cast<u64>(instance_address + size) > memory->size()) {
m_do_trap = true;
dbgln("LibWasm: Memory access out of bounds (expected 0 > {} and {} > {})", instance_address, instance_address + size, memory->size()); dbgln("LibWasm: Memory access out of bounds (expected 0 > {} and {} > {})", instance_address, instance_address + size, memory->size());
return {}; return {};
} }
@ -76,12 +88,13 @@ void Interpreter::store_to_memory(Configuration& configuration, const Instructio
{ {
auto& address = configuration.frame()->module().memories().first(); auto& address = configuration.frame()->module().memories().first();
auto memory = configuration.store().get(address); auto memory = configuration.store().get(address);
VERIFY(memory); TRAP_IF_NOT(memory);
auto& arg = instruction.arguments().get<Instruction::MemoryArgument>(); auto& arg = instruction.arguments().get<Instruction::MemoryArgument>();
auto base = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>(); auto base = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>();
VERIFY(base.has_value()); TRAP_IF_NOT(base.has_value());
auto instance_address = base.value() + static_cast<i64>(arg.offset); auto instance_address = base.value() + static_cast<i64>(arg.offset);
if (instance_address < 0 || static_cast<u64>(instance_address + data.size()) > memory->size()) { if (instance_address < 0 || static_cast<u64>(instance_address + data.size()) > memory->size()) {
m_do_trap = true;
dbgln("LibWasm: Memory access out of bounds (expected 0 > {} and {} > {})", instance_address, instance_address + data.size(), memory->size()); dbgln("LibWasm: Memory access out of bounds (expected 0 > {} and {} > {})", instance_address, instance_address + data.size(), memory->size());
return; return;
} }
@ -92,10 +105,10 @@ void Interpreter::store_to_memory(Configuration& configuration, const Instructio
void Interpreter::call_address(Configuration& configuration, FunctionAddress address) void Interpreter::call_address(Configuration& configuration, FunctionAddress address)
{ {
auto instance = configuration.store().get(address); auto instance = configuration.store().get(address);
VERIFY(instance); TRAP_IF_NOT(instance);
const FunctionType* type { nullptr }; const FunctionType* type { nullptr };
instance->visit([&](const auto& function) { type = &function.type(); }); instance->visit([&](const auto& function) { type = &function.type(); });
VERIFY(type); TRAP_IF_NOT(type);
Vector<Value> args; Vector<Value> args;
args.ensure_capacity(type->parameters().size()); args.ensure_capacity(type->parameters().size());
for (size_t i = 0; i < type->parameters().size(); ++i) { for (size_t i = 0; i < type->parameters().size(); ++i) {
@ -104,40 +117,60 @@ void Interpreter::call_address(Configuration& configuration, FunctionAddress add
Configuration function_configuration { configuration.store() }; Configuration function_configuration { configuration.store() };
function_configuration.depth() = configuration.depth() + 1; function_configuration.depth() = configuration.depth() + 1;
auto result = function_configuration.call(address, move(args)); auto result = function_configuration.call(address, move(args));
if (result.is_trap()) if (result.is_trap()) {
TODO(); m_do_trap = true;
return;
}
for (auto& entry : result.values()) for (auto& entry : result.values())
configuration.stack().push(make<Value>(move(entry))); configuration.stack().push(make<Value>(move(entry)));
} }
#define BINARY_NUMERIC_OPERATION(type, operator, ...) \ #define BINARY_NUMERIC_OPERATION(type, operator, cast, ...) \
do { \ do { \
auto rhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \ auto rhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \
auto lhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \ auto lhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \
VERIFY(lhs.has_value()); \ TRAP_IF_NOT(lhs.has_value()); \
VERIFY(rhs.has_value()); \ TRAP_IF_NOT(rhs.has_value()); \
__VA_ARGS__; \
auto result = lhs.value() operator rhs.value(); \ auto result = lhs.value() operator rhs.value(); \
dbgln_if(WASM_TRACE_DEBUG, "{} {} {} = {}", lhs.value(), #operator, rhs.value(), result); \ dbgln_if(WASM_TRACE_DEBUG, "{} {} {} = {}", lhs.value(), #operator, rhs.value(), result); \
configuration.stack().push(make<Value>(__VA_ARGS__(result))); \ configuration.stack().push(make<Value>(cast(result))); \
return; \ return; \
} while (false) } while (false)
#define BINARY_PREFIX_NUMERIC_OPERATION(type, operation, ...) \ #define OVF_CHECKED_BINARY_NUMERIC_OPERATION(type, operator, cast, ...) \
do { \
auto rhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \
auto ulhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \
TRAP_IF_NOT(ulhs.has_value()); \
TRAP_IF_NOT(rhs.has_value()); \
dbgln_if(WASM_TRACE_DEBUG, "{} {} {} = ??", ulhs.value(), #operator, rhs.value()); \
__VA_ARGS__; \
Checked lhs = ulhs.value(); \
lhs operator##= rhs.value(); \
TRAP_IF_NOT(!lhs.has_overflow()); \
auto result = lhs.value(); \
dbgln_if(WASM_TRACE_DEBUG, "{} {} {} = {}", ulhs.value(), #operator, rhs.value(), result); \
configuration.stack().push(make<Value>(cast(result))); \
return; \
} while (false)
#define BINARY_PREFIX_NUMERIC_OPERATION(type, operation, cast, ...) \
do { \ do { \
auto rhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \ auto rhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \
auto lhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \ auto lhs = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<type>(); \
VERIFY(lhs.has_value()); \ TRAP_IF_NOT(lhs.has_value()); \
VERIFY(rhs.has_value()); \ TRAP_IF_NOT(rhs.has_value()); \
auto result = operation(lhs.value(), rhs.value()); \ auto result = operation(lhs.value(), rhs.value()); \
dbgln_if(WASM_TRACE_DEBUG, "{}({} {}) = {}", #operation, lhs.value(), rhs.value(), result); \ dbgln_if(WASM_TRACE_DEBUG, "{}({} {}) = {}", #operation, lhs.value(), rhs.value(), result); \
configuration.stack().push(make<Value>(__VA_ARGS__(result))); \ configuration.stack().push(make<Value>(cast(result))); \
return; \ return; \
} while (false) } while (false)
#define UNARY_MAP(pop_type, operation, ...) \ #define UNARY_MAP(pop_type, operation, ...) \
do { \ do { \
auto value = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<pop_type>(); \ auto value = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<pop_type>(); \
VERIFY(value.has_value()); \ TRAP_IF_NOT(value.has_value()); \
auto result = operation(value.value()); \ auto result = operation(value.value()); \
dbgln_if(WASM_TRACE_DEBUG, "map({}) {} = {}", #operation, value.value(), result); \ dbgln_if(WASM_TRACE_DEBUG, "map({}) {} = {}", #operation, value.value(), result); \
configuration.stack().push(make<Value>(__VA_ARGS__(result))); \ configuration.stack().push(make<Value>(__VA_ARGS__(result))); \
@ -150,7 +183,7 @@ void Interpreter::call_address(Configuration& configuration, FunctionAddress add
#define LOAD_AND_PUSH(read_type, push_type) \ #define LOAD_AND_PUSH(read_type, push_type) \
do { \ do { \
auto slice = load_from_memory(configuration, instruction, sizeof(read_type)); \ auto slice = load_from_memory(configuration, instruction, sizeof(read_type)); \
VERIFY(slice.size() == sizeof(read_type)); \ TRAP_IF_NOT(slice.size() == sizeof(read_type)); \
if constexpr (sizeof(read_type) == 1) \ if constexpr (sizeof(read_type) == 1) \
configuration.stack().push(make<Value>(static_cast<push_type>(slice[0]))); \ configuration.stack().push(make<Value>(static_cast<push_type>(slice[0]))); \
else \ else \
@ -230,6 +263,20 @@ struct ConvertToRaw<double> {
} }
}; };
Vector<NonnullOwnPtr<Value>> Interpreter::pop_values(Configuration& configuration, size_t count)
{
Vector<NonnullOwnPtr<Value>> results;
// Pop results in order
for (size_t i = 0; i < count; ++i) {
auto top_of_stack = configuration.stack().pop();
if (auto value = top_of_stack.get_pointer<NonnullOwnPtr<Value>>())
results.append(move(*value));
else
trap_if_not(value);
}
return results;
}
void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip, const Instruction& instruction) void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip, const Instruction& instruction)
{ {
dbgln_if(WASM_TRACE_DEBUG, "Executing instruction {} at ip {}", instruction_name(instruction.opcode()), ip.value()); dbgln_if(WASM_TRACE_DEBUG, "Executing instruction {} at ip {}", instruction_name(instruction.opcode()), ip.value());
@ -237,7 +284,8 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
configuration.dump_stack(); configuration.dump_stack();
switch (instruction.opcode().value()) { switch (instruction.opcode().value()) {
case Instructions::unreachable.value(): case Instructions::unreachable.value():
VERIFY_NOT_REACHED(); // FIXME: This is definitely not right :) m_do_trap = true;
return;
case Instructions::nop.value(): case Instructions::nop.value():
return; return;
case Instructions::local_get.value(): case Instructions::local_get.value():
@ -284,7 +332,7 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
auto entry = configuration.stack().pop(); auto entry = configuration.stack().pop();
auto value = entry.get<NonnullOwnPtr<Value>>()->to<i32>(); auto value = entry.get<NonnullOwnPtr<Value>>()->to<i32>();
VERIFY(value.has_value()); TRAP_IF_NOT(value.has_value());
configuration.stack().push(make<Label>(arity, args.end_ip)); configuration.stack().push(make<Label>(arity, args.end_ip));
if (value.value() == 0) { if (value.value() == 0) {
if (args.else_ip.has_value()) { if (args.else_ip.has_value()) {
@ -300,11 +348,8 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
return; return;
case Instructions::structured_else.value(): { case Instructions::structured_else.value(): {
auto label = configuration.nth_label(0); auto label = configuration.nth_label(0);
VERIFY(label.has_value()); TRAP_IF_NOT(label.has_value());
NonnullOwnPtrVector<Value> results; auto results = pop_values(configuration, label->arity());
// Pop results in order
for (size_t i = 0; i < label->arity(); ++i)
results.append(move(configuration.stack().pop().get<NonnullOwnPtr<Value>>()));
// drop all locals // drop all locals
for (; !configuration.stack().is_empty();) { for (; !configuration.stack().is_empty();) {
@ -377,14 +422,16 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
auto table_address = configuration.frame()->module().tables()[args.table.value()]; auto table_address = configuration.frame()->module().tables()[args.table.value()];
auto table_instance = configuration.store().get(table_address); auto table_instance = configuration.store().get(table_address);
auto index = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>(); auto index = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>();
VERIFY(index.has_value()); TRAP_IF_NOT(index.has_value());
if (index.value() < 0 || static_cast<size_t>(index.value()) >= table_instance->elements().size()) { if (index.value() < 0 || static_cast<size_t>(index.value()) >= table_instance->elements().size()) {
dbgln("LibWasm: Element access out of bounds, expected {0} > 0 and {0} < {1}", index.value(), table_instance->elements().size()); dbgln("LibWasm: Element access out of bounds, expected {0} > 0 and {0} < {1}", index.value(), table_instance->elements().size());
m_do_trap = true;
return; return;
} }
auto element = table_instance->elements()[index.value()]; auto element = table_instance->elements()[index.value()];
if (!element.has_value() || !element->ref().has<FunctionAddress>()) { if (!element.has_value() || !element->ref().has<FunctionAddress>()) {
dbgln("LibWasm: call_indirect attempted with invalid address element (not a function)"); dbgln("LibWasm: call_indirect attempted with invalid address element (not a function)");
m_do_trap = true;
return; return;
} }
auto address = element->ref().get<FunctionAddress>(); auto address = element->ref().get<FunctionAddress>();
@ -441,12 +488,14 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
case Instructions::local_tee.value(): { case Instructions::local_tee.value(): {
auto value = *configuration.stack().peek().get<NonnullOwnPtr<Value>>(); auto value = *configuration.stack().peek().get<NonnullOwnPtr<Value>>();
auto local_index = instruction.arguments().get<LocalIndex>(); auto local_index = instruction.arguments().get<LocalIndex>();
TRAP_IF_NOT(configuration.frame()->locals().size() > local_index.value());
dbgln_if(WASM_TRACE_DEBUG, "stack:peek -> locals({})", local_index.value()); dbgln_if(WASM_TRACE_DEBUG, "stack:peek -> locals({})", local_index.value());
configuration.frame()->locals()[local_index.value()] = move(value); configuration.frame()->locals()[local_index.value()] = move(value);
return; return;
} }
case Instructions::global_get.value(): { case Instructions::global_get.value(): {
auto global_index = instruction.arguments().get<GlobalIndex>(); auto global_index = instruction.arguments().get<GlobalIndex>();
TRAP_IF_NOT(configuration.frame()->module().globals().size() > global_index.value());
auto address = configuration.frame()->module().globals()[global_index.value()]; auto address = configuration.frame()->module().globals()[global_index.value()];
dbgln_if(WASM_TRACE_DEBUG, "global({}) -> stack", address.value()); dbgln_if(WASM_TRACE_DEBUG, "global({}) -> stack", address.value());
auto global = configuration.store().get(address); auto global = configuration.store().get(address);
@ -455,6 +504,7 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
} }
case Instructions::global_set.value(): { case Instructions::global_set.value(): {
auto global_index = instruction.arguments().get<GlobalIndex>(); auto global_index = instruction.arguments().get<GlobalIndex>();
TRAP_IF_NOT(configuration.frame()->module().globals().size() > global_index.value());
auto address = configuration.frame()->module().globals()[global_index.value()]; auto address = configuration.frame()->module().globals()[global_index.value()];
auto value = *configuration.stack().pop().get<NonnullOwnPtr<Value>>(); auto value = *configuration.stack().pop().get<NonnullOwnPtr<Value>>();
dbgln_if(WASM_TRACE_DEBUG, "stack -> global({})", address.value()); dbgln_if(WASM_TRACE_DEBUG, "stack -> global({})", address.value());
@ -475,7 +525,8 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
auto instance = configuration.store().get(address); auto instance = configuration.store().get(address);
i32 old_pages = instance->size() / Constants::page_size; i32 old_pages = instance->size() / Constants::page_size;
auto new_pages = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>(); auto new_pages = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>();
VERIFY(new_pages.has_value()); TRAP_IF_NOT(new_pages.has_value());
dbgln_if(WASM_TRACE_DEBUG, "memory.grow({}), previously {} pages...", *new_pages, old_pages);
if (instance->grow(new_pages.value() * Constants::page_size)) if (instance->grow(new_pages.value() * Constants::page_size))
configuration.stack().push(make<Value>((i32)old_pages)); configuration.stack().push(make<Value>((i32)old_pages));
else else
@ -495,7 +546,7 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
case Instructions::select_typed.value(): { case Instructions::select_typed.value(): {
// Note: The type seems to only be used for validation. // Note: The type seems to only be used for validation.
auto value = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>(); auto value = configuration.stack().pop().get<NonnullOwnPtr<Value>>()->to<i32>();
VERIFY(value.has_value()); TRAP_IF_NOT(value.has_value());
dbgln_if(WASM_TRACE_DEBUG, "select({})", value.value()); dbgln_if(WASM_TRACE_DEBUG, "select({})", value.value());
auto rhs = move(configuration.stack().pop().get<NonnullOwnPtr<Value>>()); auto rhs = move(configuration.stack().pop().get<NonnullOwnPtr<Value>>());
auto lhs = move(configuration.stack().pop().get<NonnullOwnPtr<Value>>()); auto lhs = move(configuration.stack().pop().get<NonnullOwnPtr<Value>>());
@ -505,89 +556,89 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
case Instructions::i32_eqz.value(): case Instructions::i32_eqz.value():
UNARY_NUMERIC_OPERATION(i32, 0 ==); UNARY_NUMERIC_OPERATION(i32, 0 ==);
case Instructions::i32_eq.value(): case Instructions::i32_eq.value():
BINARY_NUMERIC_OPERATION(i32, ==); BINARY_NUMERIC_OPERATION(i32, ==, i32);
case Instructions::i32_ne.value(): case Instructions::i32_ne.value():
BINARY_NUMERIC_OPERATION(i32, !=); BINARY_NUMERIC_OPERATION(i32, !=, i32);
case Instructions::i32_lts.value(): case Instructions::i32_lts.value():
BINARY_NUMERIC_OPERATION(i32, <); BINARY_NUMERIC_OPERATION(i32, <, i32);
case Instructions::i32_ltu.value(): case Instructions::i32_ltu.value():
BINARY_NUMERIC_OPERATION(u32, <); BINARY_NUMERIC_OPERATION(u32, <, i32);
case Instructions::i32_gts.value(): case Instructions::i32_gts.value():
BINARY_NUMERIC_OPERATION(i32, >); BINARY_NUMERIC_OPERATION(i32, >, i32);
case Instructions::i32_gtu.value(): case Instructions::i32_gtu.value():
BINARY_NUMERIC_OPERATION(u32, >); BINARY_NUMERIC_OPERATION(u32, >, i32);
case Instructions::i32_les.value(): case Instructions::i32_les.value():
BINARY_NUMERIC_OPERATION(i32, <=); BINARY_NUMERIC_OPERATION(i32, <=, i32);
case Instructions::i32_leu.value(): case Instructions::i32_leu.value():
BINARY_NUMERIC_OPERATION(u32, <=); BINARY_NUMERIC_OPERATION(u32, <=, i32);
case Instructions::i32_ges.value(): case Instructions::i32_ges.value():
BINARY_NUMERIC_OPERATION(i32, >=); BINARY_NUMERIC_OPERATION(i32, >=, i32);
case Instructions::i32_geu.value(): case Instructions::i32_geu.value():
BINARY_NUMERIC_OPERATION(u32, >=); BINARY_NUMERIC_OPERATION(u32, >=, i32);
case Instructions::i64_eqz.value(): case Instructions::i64_eqz.value():
UNARY_NUMERIC_OPERATION(i64, 0ull ==); UNARY_NUMERIC_OPERATION(i64, 0ull ==);
case Instructions::i64_eq.value(): case Instructions::i64_eq.value():
BINARY_NUMERIC_OPERATION(i64, ==); BINARY_NUMERIC_OPERATION(i64, ==, i32);
case Instructions::i64_ne.value(): case Instructions::i64_ne.value():
BINARY_NUMERIC_OPERATION(i64, !=); BINARY_NUMERIC_OPERATION(i64, !=, i32);
case Instructions::i64_lts.value(): case Instructions::i64_lts.value():
BINARY_NUMERIC_OPERATION(i64, <); BINARY_NUMERIC_OPERATION(i64, <, i32);
case Instructions::i64_ltu.value(): case Instructions::i64_ltu.value():
BINARY_NUMERIC_OPERATION(u64, <); BINARY_NUMERIC_OPERATION(u64, <, i32);
case Instructions::i64_gts.value(): case Instructions::i64_gts.value():
BINARY_NUMERIC_OPERATION(i64, >); BINARY_NUMERIC_OPERATION(i64, >, i32);
case Instructions::i64_gtu.value(): case Instructions::i64_gtu.value():
BINARY_NUMERIC_OPERATION(u64, >); BINARY_NUMERIC_OPERATION(u64, >, i32);
case Instructions::i64_les.value(): case Instructions::i64_les.value():
BINARY_NUMERIC_OPERATION(i64, <=); BINARY_NUMERIC_OPERATION(i64, <=, i32);
case Instructions::i64_leu.value(): case Instructions::i64_leu.value():
BINARY_NUMERIC_OPERATION(u64, <=); BINARY_NUMERIC_OPERATION(u64, <=, i32);
case Instructions::i64_ges.value(): case Instructions::i64_ges.value():
BINARY_NUMERIC_OPERATION(i64, >=); BINARY_NUMERIC_OPERATION(i64, >=, i32);
case Instructions::i64_geu.value(): case Instructions::i64_geu.value():
BINARY_NUMERIC_OPERATION(u64, >=); BINARY_NUMERIC_OPERATION(u64, >=, i32);
case Instructions::f32_eq.value(): case Instructions::f32_eq.value():
BINARY_NUMERIC_OPERATION(float, ==); BINARY_NUMERIC_OPERATION(float, ==, i32);
case Instructions::f32_ne.value(): case Instructions::f32_ne.value():
BINARY_NUMERIC_OPERATION(float, !=); BINARY_NUMERIC_OPERATION(float, !=, i32);
case Instructions::f32_lt.value(): case Instructions::f32_lt.value():
BINARY_NUMERIC_OPERATION(float, <); BINARY_NUMERIC_OPERATION(float, <, i32);
case Instructions::f32_gt.value(): case Instructions::f32_gt.value():
BINARY_NUMERIC_OPERATION(float, >); BINARY_NUMERIC_OPERATION(float, >, i32);
case Instructions::f32_le.value(): case Instructions::f32_le.value():
BINARY_NUMERIC_OPERATION(float, <=); BINARY_NUMERIC_OPERATION(float, <=, i32);
case Instructions::f32_ge.value(): case Instructions::f32_ge.value():
BINARY_NUMERIC_OPERATION(float, >=); BINARY_NUMERIC_OPERATION(float, >=, i32);
case Instructions::f64_eq.value(): case Instructions::f64_eq.value():
BINARY_NUMERIC_OPERATION(double, ==); BINARY_NUMERIC_OPERATION(double, ==, i32);
case Instructions::f64_ne.value(): case Instructions::f64_ne.value():
BINARY_NUMERIC_OPERATION(double, !=); BINARY_NUMERIC_OPERATION(double, !=, i32);
case Instructions::f64_lt.value(): case Instructions::f64_lt.value():
BINARY_NUMERIC_OPERATION(double, <); BINARY_NUMERIC_OPERATION(double, <, i32);
case Instructions::f64_gt.value(): case Instructions::f64_gt.value():
BINARY_NUMERIC_OPERATION(double, >); BINARY_NUMERIC_OPERATION(double, >, i32);
case Instructions::f64_le.value(): case Instructions::f64_le.value():
BINARY_NUMERIC_OPERATION(double, <=); BINARY_NUMERIC_OPERATION(double, <=, i32);
case Instructions::f64_ge.value(): case Instructions::f64_ge.value():
BINARY_NUMERIC_OPERATION(double, >); BINARY_NUMERIC_OPERATION(double, >, i32);
case Instructions::i32_clz.value(): case Instructions::i32_clz.value():
case Instructions::i32_ctz.value(): case Instructions::i32_ctz.value():
case Instructions::i32_popcnt.value(): case Instructions::i32_popcnt.value():
goto unimplemented; goto unimplemented;
case Instructions::i32_add.value(): case Instructions::i32_add.value():
BINARY_NUMERIC_OPERATION(i32, +, i32); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i32, +, i32);
case Instructions::i32_sub.value(): case Instructions::i32_sub.value():
BINARY_NUMERIC_OPERATION(i32, -, i32); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i32, -, i32);
case Instructions::i32_mul.value(): case Instructions::i32_mul.value():
BINARY_NUMERIC_OPERATION(i32, *, i32); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i32, *, i32);
case Instructions::i32_divs.value(): case Instructions::i32_divs.value():
BINARY_NUMERIC_OPERATION(i32, /, i32); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i32, /, i32, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i32_divu.value(): case Instructions::i32_divu.value():
BINARY_NUMERIC_OPERATION(u32, /, i32); OVF_CHECKED_BINARY_NUMERIC_OPERATION(u32, /, i32, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i32_rems.value(): case Instructions::i32_rems.value():
BINARY_NUMERIC_OPERATION(i32, %, i32); BINARY_NUMERIC_OPERATION(i32, %, i32, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i32_remu.value(): case Instructions::i32_remu.value():
BINARY_NUMERIC_OPERATION(u32, %, i32); BINARY_NUMERIC_OPERATION(u32, %, i32, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i32_and.value(): case Instructions::i32_and.value():
BINARY_NUMERIC_OPERATION(i32, &, i32); BINARY_NUMERIC_OPERATION(i32, &, i32);
case Instructions::i32_or.value(): case Instructions::i32_or.value():
@ -607,19 +658,19 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
case Instructions::i64_popcnt.value(): case Instructions::i64_popcnt.value():
goto unimplemented; goto unimplemented;
case Instructions::i64_add.value(): case Instructions::i64_add.value():
BINARY_NUMERIC_OPERATION(i64, +, i64); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i64, +, i64);
case Instructions::i64_sub.value(): case Instructions::i64_sub.value():
BINARY_NUMERIC_OPERATION(i64, -, i64); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i64, -, i64);
case Instructions::i64_mul.value(): case Instructions::i64_mul.value():
BINARY_NUMERIC_OPERATION(i64, *, i64); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i64, *, i64);
case Instructions::i64_divs.value(): case Instructions::i64_divs.value():
BINARY_NUMERIC_OPERATION(i64, /, i64); OVF_CHECKED_BINARY_NUMERIC_OPERATION(i64, /, i64, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i64_divu.value(): case Instructions::i64_divu.value():
BINARY_NUMERIC_OPERATION(u64, /, i64); OVF_CHECKED_BINARY_NUMERIC_OPERATION(u64, /, i64, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i64_rems.value(): case Instructions::i64_rems.value():
BINARY_NUMERIC_OPERATION(i64, %, i64); BINARY_NUMERIC_OPERATION(i64, %, i64, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i64_remu.value(): case Instructions::i64_remu.value():
BINARY_NUMERIC_OPERATION(u64, %, i64); BINARY_NUMERIC_OPERATION(u64, %, i64, TRAP_IF_NOT(rhs.value() != 0));
case Instructions::i64_and.value(): case Instructions::i64_and.value():
BINARY_NUMERIC_OPERATION(i64, &, i64); BINARY_NUMERIC_OPERATION(i64, &, i64);
case Instructions::i64_or.value(): case Instructions::i64_or.value():
@ -756,6 +807,7 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
default: default:
unimplemented:; unimplemented:;
dbgln("Instruction '{}' not implemented", instruction_name(instruction.opcode())); dbgln("Instruction '{}' not implemented", instruction_name(instruction.opcode()));
m_do_trap = true;
return; return;
} }
} }

9
Userland/Libraries/LibWasm/AbstractMachine/Interpreter.h
View file

@ -12,6 +12,7 @@ namespace Wasm {
struct Interpreter { struct Interpreter {
void interpret(Configuration&); void interpret(Configuration&);
bool did_trap() const { return m_do_trap; }
private: private:
void interpret(Configuration&, InstructionPointer&, const Instruction&); void interpret(Configuration&, InstructionPointer&, const Instruction&);
@ -19,6 +20,14 @@ private:
ReadonlyBytes load_from_memory(Configuration&, const Instruction&, size_t); ReadonlyBytes load_from_memory(Configuration&, const Instruction&, size_t);
void store_to_memory(Configuration&, const Instruction&, ReadonlyBytes data); void store_to_memory(Configuration&, const Instruction&, ReadonlyBytes data);
void call_address(Configuration&, FunctionAddress); void call_address(Configuration&, FunctionAddress);
Vector<NonnullOwnPtr<Value>> pop_values(Configuration& configuration, size_t count);
bool trap_if_not(bool value)
{
if (!value)
m_do_trap = true;
return m_do_trap;
}
bool m_do_trap { false };
}; };
} }