args were put in wrong order into locals

parrt · Apr 7, 2017 · 82a6f47 · 82a6f47
1 parent d6fcefc
commit 82a6f47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/simple-virtual-machine.ipr b/simple-virtual-machine.ipr
@@ -154,7 +154,7 @@
       <module fileurl="file://$PROJECT_DIR$/simple-virtual-machine.iml" filepath="$PROJECT_DIR$/simple-virtual-machine.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="VcsDirectoryMappings">

diff --git a/src/vm/VM.java b/src/vm/VM.java
@@ -139,8 +139,9 @@ protected void cpu() {
 					int nargs = metadata[findex].nargs;	// how many args got pushed
 					ctx = new Context(ctx,ip,metadata[findex]);
 					// copy args into new context
+					int firstarg = sp-nargs+1;
 					for (int i=0; i<nargs; i++) {
-						ctx.locals[i] = stack[sp-i];
+						ctx.locals[i] = stack[firstarg+i];
 					}
 					sp -= nargs;
 					ip = metadata[findex].address;		// jump to function