pull changes

This commit is contained in:
2018-05-22 00:33:53 +02:00
parent d4f851e81b
commit 5755f61dc4
3 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ target
*.ijvm *.ijvm
*.conf *.conf
goJASM goJASM
rustijvm

2
Cargo.lock generated
View File

@@ -1,4 +1,4 @@
[root] [[package]]
name = "rustijvm" name = "rustijvm"
version = "0.1.0" version = "0.1.0"

View File

@@ -216,7 +216,7 @@ fn invokevirtual(machine: &mut Machine) -> Result<()> {
// Lifetime for cur_stack // Lifetime for cur_stack
{ {
let mut cur_stack = machine.cur_stack(); let cur_stack = machine.cur_stack();
for i in 1..arg_count { for i in 1..arg_count {
newframe.set((arg_count - i) as usize, cur_stack.pop()?)?; newframe.set((arg_count - i) as usize, cur_stack.pop()?)?;
} }