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

LibWasm: Use Core::Stream to read values in the bytecode interpreter

Browse source
This commit is contained in:
Tim Schumacher 2023-01-21 11:59:56 +01:00 • committed by Ali Mohammad Pur
parent 982ebbc304
commit 2552399bcd
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include <AK/Debug.h> #include <AK/Debug.h>
#include <LibCore/MemoryStream.h>
#include <LibWasm/AbstractMachine/AbstractMachine.h> #include <LibWasm/AbstractMachine/AbstractMachine.h>
#include <LibWasm/AbstractMachine/BytecodeInterpreter.h> #include <LibWasm/AbstractMachine/BytecodeInterpreter.h>
#include <LibWasm/AbstractMachine/Configuration.h> #include <LibWasm/AbstractMachine/Configuration.h>
@ -201,9 +202,8 @@ struct ConvertToRaw<float> {
{ {
LittleEndian<u32> res; LittleEndian<u32> res;
ReadonlyBytes bytes { &value, sizeof(float) }; ReadonlyBytes bytes { &value, sizeof(float) };
InputMemoryStream stream { bytes }; auto stream = Core::Stream::FixedMemoryStream::construct(bytes).release_value_but_fixme_should_propagate_errors();
stream >> res; stream->read_entire_buffer(res.bytes()).release_value_but_fixme_should_propagate_errors();
VERIFY(!stream.has_any_error());
return static_cast<u32>(res); return static_cast<u32>(res);
} }
}; };
@ -214,9 +214,8 @@ struct ConvertToRaw<double> {
{ {
LittleEndian<u64> res; LittleEndian<u64> res;
ReadonlyBytes bytes { &value, sizeof(double) }; ReadonlyBytes bytes { &value, sizeof(double) };
InputMemoryStream stream { bytes }; auto stream = Core::Stream::FixedMemoryStream::construct(bytes).release_value_but_fixme_should_propagate_errors();
stream >> res; stream->read_entire_buffer(res.bytes()).release_value_but_fixme_should_propagate_errors();
VERIFY(!stream.has_any_error());
return static_cast<u64>(res); return static_cast<u64>(res);
} }
}; };
@ -253,9 +252,9 @@ template<typename T>
T BytecodeInterpreter::read_value(ReadonlyBytes data) T BytecodeInterpreter::read_value(ReadonlyBytes data)
{ {
LittleEndian<T> value; LittleEndian<T> value;
InputMemoryStream stream { data }; auto stream = Core::Stream::FixedMemoryStream::construct(data).release_value_but_fixme_should_propagate_errors();
stream >> value; auto maybe_error = stream->read_entire_buffer(value.bytes());
if (stream.handle_any_error()) { if (maybe_error.is_error()) {
dbgln("Read from {} failed", data.data()); dbgln("Read from {} failed", data.data());
m_trap = Trap { "Read from memory failed" }; m_trap = Trap { "Read from memory failed" };
} }
@ -265,10 +264,10 @@ T BytecodeInterpreter::read_value(ReadonlyBytes data)
template<> template<>
float BytecodeInterpreter::read_value<float>(ReadonlyBytes data) float BytecodeInterpreter::read_value<float>(ReadonlyBytes data)
{ {
InputMemoryStream stream { data };
LittleEndian<u32> raw_value; LittleEndian<u32> raw_value;
stream >> raw_value; auto stream = Core::Stream::FixedMemoryStream::construct(data).release_value_but_fixme_should_propagate_errors();
if (stream.handle_any_error()) auto maybe_error = stream->read_entire_buffer(raw_value.bytes());
if (maybe_error.is_error())
m_trap = Trap { "Read from memory failed" }; m_trap = Trap { "Read from memory failed" };
return bit_cast<float>(static_cast<u32>(raw_value)); return bit_cast<float>(static_cast<u32>(raw_value));
} }
@ -276,10 +275,10 @@ float BytecodeInterpreter::read_value<float>(ReadonlyBytes data)
template<> template<>
double BytecodeInterpreter::read_value<double>(ReadonlyBytes data) double BytecodeInterpreter::read_value<double>(ReadonlyBytes data)
{ {
InputMemoryStream stream { data };
LittleEndian<u64> raw_value; LittleEndian<u64> raw_value;
stream >> raw_value; auto stream = Core::Stream::FixedMemoryStream::construct(data).release_value_but_fixme_should_propagate_errors();
if (stream.handle_any_error()) auto maybe_error = stream->read_entire_buffer(raw_value.bytes());
if (maybe_error.is_error())
m_trap = Trap { "Read from memory failed" }; m_trap = Trap { "Read from memory failed" };
return bit_cast<double>(static_cast<u64>(raw_value)); return bit_cast<double>(static_cast<u64>(raw_value));
} }