Noratrieb/dilaria
1
0
Fork 0
mirror of https://github.com/Noratrieb/dilaria.git synced 2026-01-16 02:15:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

try to fix stack things

Browse source
This commit is contained in:
nora 2022-01-07 21:45:00 +01:00
parent 628899dde7
commit e9cad4b49e
4 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/compile.rs
View file

@ -207,13 +207,19 @@ impl<'bc, 'gc> Compiler<'bc, 'gc> {
*/
let first_stmt_idx = self.code_len();
let pre_loop_stack_size = self.current_stack_size();
self.loop_nesting += 1;
self.compile_block(ast_block)?;
let jmp_offset = self.back_jmp_offset(first_stmt_idx);
self.push_instr(
Instr::ShrinkStack(self.current_stack_size() - pre_loop_stack_size),
StackChange::None,
span,
);
let jmp_offset = self.back_jmp_offset(first_stmt_idx);
self.push_instr(Instr::Jmp(jmp_offset), StackChange::None, span);
self.end_loop();
@ -231,7 +237,7 @@ impl<'bc, 'gc> Compiler<'bc, 'gc> {
*/
let cond_index = self.code_len();
let pre_loop_stack_size = self.current_stack_size();
self.loop_nesting += 1;
self.compile_expr(&while_stmt.cond)?;
@ -241,6 +247,11 @@ impl<'bc, 'gc> Compiler<'bc, 'gc> {
self.compile_block(&while_stmt.body)?;
self.push_instr(
Instr::ShrinkStack(self.current_stack_size() - pre_loop_stack_size),
StackChange::None,
while_stmt.span,
);
let jmp_offset = self.back_jmp_offset(cond_index);
self.push_instr(Instr::Jmp(jmp_offset), StackChange::None, while_stmt.span);
@ -393,6 +404,11 @@ impl<'bc, 'gc> Compiler<'bc, 'gc> {
block.code.len() as isize
}
fn current_stack_size(&self) -> usize {
let block = &self.blocks[self.current_block];
block.stack_sizes.last().copied().unwrap_or(0)
}
fn change_instr(&mut self, index: usize, instr: Instr) {
let block = &mut self.blocks[self.current_block];
block.code[index] = instr;