Merge branch 'add-functions' into split-stack

parrt · Apr 14, 2015 · c1b1d29 · c1b1d29
2 parents f641409 + 8a8b169
commit c1b1d29
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/vm/Bytecode.java b/src/vm/Bytecode.java
@@ -27,9 +27,11 @@ public Instruction(String name, int nargs) {
 	public static final short GSTORE = 13;  // store in global memory
 	public static final short PRINT  = 14;  // print stack top
 	public static final short POP  = 15;    // throw away top of stack
-	public static final short HALT = 16;
-	public static final short CALL = 17;
-	public static final short RET  = 18;    // return with/without value
+	public static final short CALL = 16;
+	public static final short RET  = 17;    // return with/without value
+
+
+	public static final short HALT = 19;
 
 	public static Instruction[] instructions = new Instruction[] {
 		null, // <INVALID>
@@ -48,8 +50,8 @@ public Instruction(String name, int nargs) {
 		new Instruction("gstore", 1),
 		new Instruction("print"),
 		new Instruction("pop"),
-		new Instruction("halt"),
 		new Instruction("call", 2), // call addr, nargs
-		new Instruction("ret")
+		new Instruction("ret"),
+		new Instruction("halt")
 	};
 }