@@ -13,8 +13,7 @@ namespace evmone
13
13
{
14
14
namespace
15
15
{
16
- constexpr uint8_t FORMAT = 0xef ;
17
- constexpr uint8_t MAGIC = 0x00 ;
16
+ constexpr uint8_t MAGIC[] = {0xef , 0x00 };
18
17
constexpr uint8_t TERMINATOR = 0x00 ;
19
18
constexpr uint8_t CODE_SECTION = 0x01 ;
20
19
constexpr uint8_t DATA_SECTION = 0x02 ;
@@ -35,7 +34,7 @@ std::pair<EOFSectionHeaders, EOFValidationError> validate_eof_headers(bytes_view
35
34
uint8_t section_id = 0 ;
36
35
EOFSectionHeaders section_headers{};
37
36
const auto container_end = container.end ();
38
- auto it = container.begin () + 1 + sizeof (MAGIC) + 1 ; // FORMAT + MAGIC + VERSION
37
+ auto it = container.begin () + std::size (MAGIC) + 1 ; // MAGIC + VERSION
39
38
while (it != container_end && state != State::terminated)
40
39
{
41
40
switch (state)
@@ -144,20 +143,20 @@ size_t EOF1Header::code_begin() const noexcept
144
143
assert (code_size != 0 );
145
144
146
145
if (data_size == 0 )
147
- return 7 ; // EF + MAGIC + VERSION + SECTION_ID + SIZE + TERMINATOR
146
+ return 7 ; // MAGIC + VERSION + SECTION_ID + SIZE + TERMINATOR
148
147
else
149
- return 10 ; // EF + MAGIC + VERSION + SECTION_ID + SIZE + SECTION_ID + SIZE + TERMINATOR
148
+ return 10 ; // MAGIC + VERSION + SECTION_ID + SIZE + SECTION_ID + SIZE + TERMINATOR
150
149
}
151
150
152
151
bool is_eof_code (bytes_view code) noexcept
153
152
{
154
- return code.size () > 1 && code[0 ] == FORMAT && code[1 ] == MAGIC;
153
+ return code.size () > 1 && code[0 ] == MAGIC[ 0 ] && code[1 ] == MAGIC[ 1 ] ;
155
154
}
156
155
157
156
EOF1Header read_valid_eof1_header (bytes_view::const_iterator code) noexcept
158
157
{
159
158
EOF1Header header;
160
- const auto code_size_offset = 4 ; // FORMAT + MAGIC + VERSION + CODE_SECTION_ID
159
+ const auto code_size_offset = 4 ; // MAGIC + VERSION + CODE_SECTION_ID
161
160
header.code_size =
162
161
static_cast <uint16_t >((code[code_size_offset] << 8 ) | code[code_size_offset + 1 ]);
163
162
if (code[code_size_offset + 2 ] == 2 ) // is data section present
@@ -171,7 +170,7 @@ EOF1Header read_valid_eof1_header(bytes_view::const_iterator code) noexcept
171
170
172
171
uint8_t get_eof_version (bytes_view container) noexcept
173
172
{
174
- return (container.size () >= 3 && container[0 ] == FORMAT && container[1 ] == MAGIC) ?
173
+ return (container.size () >= 3 && container[0 ] == MAGIC[ 0 ] && container[1 ] == MAGIC[ 1 ] ) ?
175
174
container[2 ] :
176
175
0 ;
177
176
}
0 commit comments