From 5755f61dc4ef86aea38190a9e757d79fa16ce136 Mon Sep 17 00:00:00 2001 From: Jur van den Berg Date: Tue, 22 May 2018 00:33:53 +0200 Subject: [PATCH] pull changes --- .gitignore | 1 + Cargo.lock | 2 +- src/ijvm/ops.rs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 623ee40..e158932 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target *.ijvm *.conf goJASM +rustijvm diff --git a/Cargo.lock b/Cargo.lock index 005e0c7..915d492 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,4 +1,4 @@ -[root] +[[package]] name = "rustijvm" version = "0.1.0" diff --git a/src/ijvm/ops.rs b/src/ijvm/ops.rs index c052d1d..ce3e9bd 100644 --- a/src/ijvm/ops.rs +++ b/src/ijvm/ops.rs @@ -216,7 +216,7 @@ fn invokevirtual(machine: &mut Machine) -> Result<()> { // Lifetime for cur_stack { - let mut cur_stack = machine.cur_stack(); + let cur_stack = machine.cur_stack(); for i in 1..arg_count { newframe.set((arg_count - i) as usize, cur_stack.pop()?)?; }