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

LibWasm: Give traps a reason and display it when needed

Browse source 
This makes debugging wasm code a bit easier, as we now know what fails
instead of just "too bad, something went wrong".
This commit is contained in:
Ali Mohammad Pur 2021-07-01 17:03:17 +04:30 • committed by Ali Mohammad Pur
parent 62ca81fdcc
commit b538e15548
10 changed files with 54 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.h
View file

@ -14,8 +14,9 @@ namespace Wasm {
struct BytecodeInterpreter : public Interpreter {
virtual void interpret(Configuration&) override;
virtual ~BytecodeInterpreter() override = default;
virtual bool did_trap() const override { return m_do_trap; }
virtual void clear_trap() override { m_do_trap = false; }
virtual bool did_trap() const override { return m_trap.has_value(); }
virtual String trap_reason() const override { return m_trap.value().reason; }
virtual void clear_trap() override { m_trap.clear(); }
struct CallFrameHandle {
explicit CallFrameHandle(BytecodeInterpreter& interpreter, Configuration& configuration)
@ -48,13 +49,14 @@ protected:
T read_value(ReadonlyBytes data);
Vector<Value> pop_values(Configuration& configuration, size_t count);
bool trap_if_not(bool value)
bool trap_if_not(bool value, String reason)
{
if (!value)
m_do_trap = true;
return m_do_trap;
m_trap = Trap { move(reason) };
return m_trap.has_value();
}
bool m_do_trap { false };
Optional<Trap> m_trap;
};
struct DebuggerBytecodeInterpreter : public BytecodeInterpreter {