nova/RustIJVM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch the global list to Weak based pointers, allowing us to actually use rust lifetimes for heaps

Browse Source
This commit is contained in:
Jur van den Berg
2019-06-03 10:12:49 +02:00
parent 84bdcf4b20
commit fa49500139
2 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ops.rs
View File

@@ -267,20 +267,14 @@ fn invokevirtual(machine: &mut Machine) -> Result<()> {
}
fn ireturn(machine: &mut Machine) -> Result<()> {
// Lifetime for prev frame, allows gc to reap into the frame
{
let mut prev_frame: Frame = match machine.frame.pop() {
Some(a) => a,
None => return Err("Got no frame... somehow..."),
};
let result = prev_frame.stack.pop()?;
let return_addr: i32 = prev_frame.get(0)?.try_into()?;
machine.cur_stack().push(result);
machine.block.seek(return_addr as usize)?;
}
machine.heap.gc();
Ok(())
let mut prev_frame: Frame = match machine.frame.pop() {
Some(a) => a,
None => return Err("Got no frame... somehow..."),
};
let result = prev_frame.stack.pop()?;
let return_addr: i32 = prev_frame.get(0)?.try_into()?;
machine.cur_stack().push(result);
machine.block.seek(return_addr as usize)
}
#[cfg(feature = "extra:sleep")]