andre/tyche
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

.

Browse Source
This commit is contained in:
Andre Wagner
2026-04-28 11:42:12 -05:00
parent 84f725634e
commit c17788eeab
6 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bytecode/bytecode.cc
View File

@@ -17,9 +17,9 @@ Bytecode::Bytecode(ByteArray ba)
throw BytecodeParsingError("Unexpected bytecode format version");
// load cache
cache_.constants_addr = byte_array_.get_uint32(HEADER_SZ);
cache_.constants_idx_addr = byte_array_.get_uint32(HEADER_SZ);
cache_.n_constants = byte_array_.get_uint16(HEADER_SZ + 4);
cache_.functions_addr = byte_array_.get_uint32(HEADER_SZ + 6);
cache_.functions_idx_addr = byte_array_.get_uint32(HEADER_SZ + 6);
cache_.n_functions = byte_array_.get_uint16(HEADER_SZ + 10);
}
@@ -35,7 +35,8 @@ uint32_t Bytecode::n_functions() const
int32_t Bytecode::get_constant_int(uint32_t idx) const
{
return 0;
uint32_t constant_idx = byte_array_.get_uint32(cache_.constants_idx_addr + (idx * 4));
return byte_array_.get_int(constant_idx).first;
}
float Bytecode::get_constant_float(uint32_t idx) const
@@ -108,6 +109,7 @@ ByteArray Bytecode::generate(BytecodePrototype const& bp)
ba.set_uint32(idx, const_idx);
idx += 4;
}
uint32_t constants_raw_data_addr = ba.size();
ba.append_bytearray(constant_array);
// constant index
@@ -127,6 +129,7 @@ ByteArray Bytecode::generate(BytecodePrototype const& bp)
idx += 8;
code_idx += f.second;
}
uint32_t functions_raw_data_addr = ba.size();
for (auto const& f: bp.functions)
ba.append_bytearray(f.code);
@@ -136,6 +139,14 @@ ByteArray Bytecode::generate(BytecodePrototype const& bp)
ba.set_uint16(HEADER_SZ + 6 + 4, functions.size());
}
// constants raw data
if (!constant_table.empty())
ba.set_uint32(HEADER_SZ + (2 * 6), constants_raw_data_addr);
// function raw data
if (!functions.empty())
ba.set_uint32(HEADER_SZ + (3 * 6), functions_raw_data_addr);
return ba;
}

6
src/bytecode/bytecode.hh
View File

@@ -38,10 +38,12 @@ private:
// caching for faster reading of data
struct Cache {
uint32_t constants_addr;
uint32_t constants_idx_addr;
uint16_t n_constants;
uint32_t functions_addr;
uint32_t constants_start_addr;
uint32_t functions_idx_addr;
uint32_t n_functions;
uint32_t functions_start_addr;
};
Cache cache_ {};
};

16
src/bytecode/tests.cc
View File

@@ -69,7 +69,7 @@ TEST(Bytecode, Constants)
// index
0x40, 0x00, 0x00, 0x00, 0x02, 0x00, // constants
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // functions
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x48, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -109,7 +109,7 @@ TEST(Bytecode, Code)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // constants
0x40, 0x00, 0x00, 0x00, 0x02, 0x00, // variables
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -124,6 +124,7 @@ TEST(Bytecode, Code)
};
ByteArray ba = Bytecode::generate(bp);
print(ba.data()); print(expected);
ASSERT_EQ(ba.data(), expected);
}
@@ -145,13 +146,18 @@ TEST(Bytecode, Parsing)
f2.code.append_byte(0x42);
ByteArray ba = Bytecode::generate(bp);
print(ba.data());
// read bytecode
Bytecode bc2(std::move(ba));
Bytecode bc(std::move(ba));
ASSERT_EQ(bc2.n_constants(), 3);
ASSERT_EQ(bc2.n_functions(), 2);
ASSERT_EQ(bc.n_constants(), 3);
ASSERT_EQ(bc.n_functions(), 2);
ASSERT_EQ(bc.get_constant_int(0), 42);
ASSERT_FLOAT_EQ(bc.get_constant_float(1), 3.14f);
ASSERT_EQ(bc.get_constant_string(2), "HELLO");
}
int main(int argc, char** argv)