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

Add base pointer to frame class. Has no real use outside of webijvm

Browse Source
This commit is contained in:
Jur van den Berg
2019-04-18 00:38:17 +02:00
parent 932abd0cb2
commit 73a03ddbb0
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ops.rs
View File

@@ -235,13 +235,13 @@ fn iinc(machine: &mut Machine) -> Result<()> {
fn invokevirtual(machine: &mut Machine) -> Result<()> {
let method_index = machine.block.read_u16()?;
let invoke_addr = machine.pool.get(method_index as usize)?;
let invoke_addr = machine.pool.get(method_index as usize)? as usize;
let return_addr = machine.get_program_counter();
machine.block.seek(invoke_addr as usize)?;
machine.block.seek(invoke_addr)?;
let arg_count = machine.block.read_u16()?;
let var_count = machine.block.read_u16()?;
let mut newframe = Frame::new((arg_count + var_count) as usize);
let mut newframe = Frame::new((arg_count + var_count) as usize, invoke_addr);
// Lifetime for cur_stack
{