Merge pull request #9060 from ethereum/wasm-flags-in-binary-transform

Constants for flags in wasm::BinaryTransform (refactor)
This commit is contained in:
Alex Beregszaszi 2020-05-29 11:39:08 +01:00 committed by GitHub
commit b01a1a36b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,6 +39,18 @@ bytes toBytes(uint8_t _b)
return bytes(1, _b); return bytes(1, _b);
} }
enum class LimitsKind: uint8_t
{
Min = 0x00,
MinMax = 0x01,
};
enum class Mutability: uint8_t
{
Const = 0x00,
Var = 0x01,
};
enum class Section: uint8_t enum class Section: uint8_t
{ {
CUSTOM = 0x00, CUSTOM = 0x00,
@ -530,8 +542,8 @@ bytes BinaryTransform::functionSection(vector<FunctionDefinition> const& _functi
bytes BinaryTransform::memorySection() bytes BinaryTransform::memorySection()
{ {
bytes result = lebEncode(1); bytes result = lebEncode(1);
result.push_back(0); // flags result.push_back(static_cast<uint8_t>(LimitsKind::Min));
result.push_back(1); // initial result.push_back(1); // initial length
return makeSection(Section::MEMORY, std::move(result)); return makeSection(Section::MEMORY, std::move(result));
} }
@ -540,8 +552,8 @@ bytes BinaryTransform::globalSection()
bytes result = lebEncode(m_globals.size()); bytes result = lebEncode(m_globals.size());
for (size_t i = 0; i < m_globals.size(); ++i) for (size_t i = 0; i < m_globals.size(); ++i)
result += result +=
// mutable i64 toBytes(ValueType::I64) +
bytes{uint8_t(ValueType::I64), 1} + lebEncode(static_cast<uint8_t>(Mutability::Var)) +
toBytes(Opcode::I64Const) + toBytes(Opcode::I64Const) +
lebEncodeSigned(0) + lebEncodeSigned(0) +
toBytes(Opcode::End); toBytes(Opcode::End);