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

bytecode2 #2

Merged
andre merged 20 commits from bytecode2 into master 2026-04-28 19:50:48 -05:00
Conversation 0 Commits 20 Files Changed 11 +5 -7
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84f725634e - Show all commits

8
src/bytecode/bytecode.cc
View File

@@ -90,8 +90,8 @@ ByteArray Bytecode::generate(BytecodePrototype const& bp)
std::vector<std::pair<FunctionDef, uint32_t>> functions; std::vector<std::pair<FunctionDef, uint32_t>> functions;
ByteArray code; ByteArray code;
for (auto const& f: bp.functions) { for (auto const& f: bp.functions) {
functions.emplace_back(std::make_pair(FunctionDef { f.n_pars, f.n_locals }, code.size()));
code.append_bytearray(f.code); code.append_bytearray(f.code);
functions.emplace_back(std::make_pair(FunctionDef { f.n_pars, f.n_locals }, code.size()));
} }
// //
@@ -117,13 +117,13 @@ ByteArray Bytecode::generate(BytecodePrototype const& bp)
} }
// functions // functions
size_t functions_start = idx + (constant_table.size() * 4) + ba.size(); size_t functions_start = idx + (constant_table.size() * 4);
idx += functions_start; idx = functions_start;
uint32_t code_idx = 0; uint32_t code_idx = 0;
for (auto const& f: functions) { for (auto const& f: functions) {
ba.set_uint32(idx, code_idx); ba.set_uint32(idx, code_idx);
ba.set_uint16(idx + 4, f.first.n_params); ba.set_uint16(idx + 4, f.first.n_params);
ba.set_uint16(idx + 6, f.first.n_params); ba.set_uint16(idx + 6, f.first.locals);
idx += 8; idx += 8;
code_idx += f.second; code_idx += f.second;
} }

4
src/bytecode/tests.cc
View File

@@ -117,16 +117,14 @@ TEST(Bytecode, Code)
// function definitions // function definitions
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
// code // code
0x68, 0x54, 0x42, 0x68, 0x54, 0x42,
}; };
/*
ByteArray ba = Bytecode::generate(bp); ByteArray ba = Bytecode::generate(bp);
ASSERT_EQ(ba.data(), expected); ASSERT_EQ(ba.data(), expected);
*/
} }
TEST(Bytecode, Parsing) TEST(Bytecode, Parsing)